racl101 + git   348

How to use `git mergetool` to resolve conflicts
Here's a Github project specifically for learning to use vimdiff as the Git merge tool
github  gist  tutorial  howto  example  git  merge  tool  guide  reference  3  way  repository  toread  tolearn  totry  tounderstand 
january 2019 by racl101
git - Configuring diff tool with .gitconfig - Stack Overflow
Shows, for example how to set a diff / merge tool that isn't one of the regularly supported ones like vimdiff for example.
stackoverflow  howto  example  set  diff  merge  tool  global  git  config  custom  configure  command  bbdiff  guide  reference 
december 2018 by racl101
git ready » squashing commits with rebase
Another good tutorial explaining how Git rebase works. This one is more focused to squashing commits.
git  blog  tutorial  guide  reference  howto  example  rebase  commit  repository  history  clean  messages  toread  tolearn  totry  tounderstand 
december 2018 by racl101
How (and why!) to keep your Git commit history clean | GitLab
This is a really good tutorial explaining how Git rebase works. At least, I understood it.
git  blog  tutorial  guide  reference  howto  example  rebase  commit  repository  history  clean  messages  toread  tolearn  totry  tounderstand 
december 2018 by racl101
git: fetch and merge, don’t pull | Mark's Blog
Really good tutorial explaining the nuances between git pull and git fetch & git merge combination and why it's important to not always use git pull.
blog  tutorial  git  pull  fetch  merge  refspecs  branches  remotes  tracking  set  upstream  configuration  explanation  howto  example  guide  reference 
december 2018 by racl101
Rename a git submodule - Stack Overflow

$ mv submodule-oldpath ~/another-location
$ git rm submodule-oldpath
$ git submodule add submodule-repository-URL submodule-newpath
stackoverflow  git  howto  example  rename  submodule  guide  reference  mv  rm  remove  move 
october 2018 by racl101
How do I use remote machine's SSH keys in ansible git module - Stack Overflow
This example uses the standard: git@github.com:path/to/repo.git path that isn't obvious from the official documentation. Also, if it you're trying to clone a repo for the first time make sure to set: accept_hostkey: yes or else it won't work. Additionally, the path specified by dest will be where the files will be downloaded to. That is, it won't create a new directory in addition to the path pointed to by dest.
stackoverflow  ansible  howto  example  clone  git  repo  module  known_hosts  first  time  guide  reference 
july 2018 by racl101
Exclude a directory from git diff - Stack Overflow
Provides a way to ignore noisy output from JavaScript files generated by Webpack in git diff calls and they just show up as binary files differ statements.

Here's a specific .gitattributes rule for that:

public/js/**/*.js -diff
stackoverflow  howto  limit  git  diff  output  example  javascript  js  filepath  guide  reference  binary 
may 2018 by racl101
Git - gitattributes Documentation
Need to read and understand this. Supposedly, perhaps I can use gitattributes to get git diff output to not return output from certain paths. This would be helpful when using asset bundlers like Webpack and I don't want to have to look at thousands of lines of generated JavaScript.
git  gitbook  book  documentation  gitattributes  attributes  toread  tolearn  totry  tounderstand  tutorial 
may 2018 by racl101
gitignore/Objective-C.gitignore at master · github/gitignore
I'm using this in the Dimos project (which is Objective-C) based on Xcode v10.1 . Only thing, however, is that I do include the xcshareddata/ directory.
github  example  gitignore  xcode  ios  development  guide  reference  git  source  control  howto  xcode10 
march 2018 by racl101
git checkout - How to revert Git repository to a previous commit? - Stack Overflow
This is the command you are looking for if you want to revert to a commit and delete any local changes.

# This will destroy any local modifications.
# Don't do it if you have uncommitted work you want to keep.
git reset --hard <commit-number>
stackoverflow  howto  git  example  revert  repository  previous  commit  delete  local  changes  guide  reference 
february 2018 by racl101
« earlier      
per page:    204080120160

related tags

3-way  a  abbreviated  Abbreviation  account  Activity  Add  added  admin  adog  advice  alias  aliases  all  alternative  Amazon  ammend  ancestor  ancestral  android  android-manifest  annotated  ansible  app  apple  apps  apt-get  article  atlassian  attributes  author  automate  automated  Awesome  aws  backup  bare  bash  basic  basics  bbdiff  beanstalk  beginner  best  bestpractices  between  binary  bitbucket  Blame  blog  blow  blueprint  book  books  bower  boxfile  branch  branches  branching  branching-model  build  bundle  C  cached  caret  carriage  case  change  changed  changes  cheat  cheatsheet  Check  checkout  cherry  Choose  clean  clear  client  clone  cloud  code  codeigniter  collaboration  color  combine  command  commandline  commands  commit  commits  common  comparison  components  composer  composer.json  composer.lock  concepts  config  configuration  configure  confituration  conflict  container  control  coolestguidesontheplanet  copy  could  create  credentials  css  csv  culttt  currently  custom  customization  cygwin  daemon  Database  date  day  default  delete  deleted  deleting  dependencies  deploying  deployment  deployments  design  designers  detached  details  detect  dev  developer  development  develpment  diagram  diff  difference  different  diffmerge  digitalocean  directories  directory  discard  display  distributed  documentation  dog  download  dropbox  dzone  ebook  ebooks  editor  email  empty  encrypted  endings  enviroment  envoy  epub  Everything  example  examples  excel  except  execute  existing  explanation  explicit  export  extension  fatal  fedora  fetch  file  filemode  filenames  filepath  files  filesharing  filesystem  find  first  fix  Forget  formats  formatting  forum  framework  free  from  fundamentals  g  gem  generate  gettingstarted  gif  gist  git  git-book  git-clone  git-config  git-flow  git-ignore-file  git-log  git-rebase  git-remote  git-rev-list  gitattributes  gitbook  Githook  github  gitignore  gitosis  Gitsh  Gitv1.8.0  gitx  Given  global  gollum  Google  Googlecode  gotcha  graph  graphs  GTk  gui  guide  hackernoon  hacks  hash  hat  head  heads  help  heroku  history  hook  hooks  hosted  hosting  howo  howto  ideal  idenity  identity  ignore  include  inconsistencies  index  information  install  installation  installer  interesting  interface  internal  internals  ios  ipad  issue  itself  java  javascript  jenkins  job  js  kaleidoscope  keep  key  keygen  keys  known  known_hosts  ksdiff  laravel  laravel4  laravel5  Laravel5.2  lazy  leading  learning  legit  leopard  less  level  library  limit  line  linus  linux  list  local  lock  log  logo  mac  macos  macosx  mag  management  manifest  manpage  manual  markdown  markup  master  medium  mercurial  merge  mergetool  merging  message  messages  migration  mode  modern  module  move  msysgit  multiple  mv  mysql  name  need  new  no  not  notation  nth  object  objects  official  oneline  oneliner  only  opensource  openssl  option  options  osx  output  override  overview  p4merge  package  packaging  page  pager  pagodabox  pagodaboxv2  pair  parse  parser  particular  perfect  perforce  period  perl  philsturgeon  php  phpstorm  pick  plugin  pointing  post-update  practices  pre-commit  prefer-dist  pretty  previous  print  private  pro  progit  programmers  programmers.stackexchange  programming  project  prompt  protocol  protocols  pruning  public  pull  push  python  rails  ranges  rbenv  reading  rebase  rebasing  recommendation  recommended  reference  references  Referene  refs  refspec  refspecs  remote  remotes  remove  rename  renaming  replace  repo  report  repository  request  reset  resetting  resolve  resources  restore  retrive  return  rev-parse  revert  reverting  revision  rm  rollback  root  ruby  rubyonrails  rules  scm  scope  screencast  script  sdk  secure  security  see  self  server  Service  services  set  settings  setup  sharing  sheets  shell  show  skills  slashes  snow-leopard  snowleopard  software  softwaredevelopment  source  sourcetree  sparkleshare  specific  specification  specify  ssh  ssh-agent  ssh-keygen  stackexchange  stackoverflow  stacoverflow  stash  stashing  state  status  stop  storage  storing  stuff  subdirectory  subject  sublimetext  sublimetext3  submodule  submodules  subversion  superuser  superuser.com  superuser.stackexchange  support  svn  sync  syntax  sysadmin  tag  tagged  tagging  task  template  textmate  Theme  Threewaymerge  tig  tilde  time  timestamp  tips  to  tolearn  tool  tools  toplevel  toread  torvalds  totry  tounderstand  tower  track  tracking  transition  tricks  troubleshoot  troubleshooting  trunk  Tunderstand  tutorial  tutorials  two  ubuntu  ubuntu14.04  ui  undo  unix  unstage  untrack  untracked  up  updates  upstream  url  use  user  username  valid  variables  vcs  version  versioncontrol  video  View  vim  vimdiff  way  web  webdesign  webdev  well  wiki  windows  with  within  without  wordpress  work  workflow  workflows  working  wp-engine  wpengine  write  xcode  xcode6  xcode9  xcode10  xcshareddata  xcuserdata  yosemite  youtube 

Copy this bookmark: