Add git-mergetool to run an appropriate merge conflict resolution program
[gitweb.git] / Documentation / diff-format.txt
2007-03-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-03-12 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-06 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-25 Merge git://repo.or.cz/git-gui into maint
2007-02-21 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-18 Merge git://git./pub/scm/gitk/gitk into maint
2007-02-14 Merge branch 'js/reverse'
2007-02-14 Merge branch 'jc/diff-apply-patch'
2007-02-14 Merge branch 'jc/merge-base' (early part)
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-12 Merge git-gui
2007-02-08 Merge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-07 Merge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-07 Merge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-04 Merge branch 'master' into np/dreflog
2007-02-04 Assorted typo fixes
2007-01-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-14 Merge branch 'master' into sp/fast-import
2007-01-09 Merge branch 'maint'
2007-01-05 Merge branch 'maint'
2006-12-27 Merge branch 'master' into js/shallow
2006-12-22 Merge branch 'maint'
2006-12-20 Merge branch 'maint'
2006-12-14 Merge branch 'maint'
2006-12-13 Merge branch 'jc/commit-careful'
2006-12-13 Merge branch 'maint'
2006-12-13 Merge branch 'maint'
2006-12-11 Merge branch 'maint'
2006-12-07 Merge branch 'maint'
2006-12-06 Merge branch 'maint'
2006-12-05 Merge branch 'maint'
2006-12-03 Merge branch 'maint'
2006-11-29 Merge master.kernel.org:/pub/scm/gitk/gitk
2006-11-29 Merge branch 'maint'
2006-11-29 Merge branch 'jc/globfetch'
2006-11-29 Merge branch 'maint'
2006-11-27 Update documentation to remove incorrect GIT_DIFF_OPTS...
2006-11-24 Merge branch 'jc/upload-pack'
2006-11-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-11-08 Merge branch 'jc/pickaxe'
2006-11-05 Merge branch 'pb/web'
2006-11-03 Merge branch 'sp/keep-pack' into np/index-pack
2006-11-01 Merge branch 'rs/cherry'
2006-11-01 Merge branch 'jc/refs-and-fetch'
2006-11-01 Merge branch 'lj/refs'
2006-10-29 Merge early part of branch 'np/index-pack' into sp...
2006-10-27 Merge branch 'maint'
2006-10-27 Merge branch 'jc/combined' into maint
2006-10-27 diff-format.txt: Correct information about pathnames...
2006-10-26 Merge branch 'jc/combined'
2006-10-26 combine-diff: a few more finishing touches.
2006-10-26 diff-format.txt: Combined diff format documentation...
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10 Merge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04 Merge branch 'new' of git://git./gitk/gitk into next
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-03 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-31 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-26 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-01-30 Merge fixes up to GIT 1.1.6
2006-01-28 Documentation: diff -c/--cc
2006-01-06 Merge fixes up to GIT 1.0.7
2006-01-06 GIT 1.0.7 v1.0.7
2005-12-29 Documentation: spell.
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-22 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-17 GIT 0.99.9j aka 1.0rc3 v0.99.9jv1.0rc3
2005-11-15 Documentation: do not blindly run 'cat' .git/HEAD,...
2005-11-12 GIT 0.99.9h v0.99.9hv1.0rc1
2005-11-11 Change 'cache' to 'index' in the docs
2005-11-07 GIT 0.99.9e v0.99.9e
2005-10-31 GIT 0.99.9a v0.99.9a
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-23 Merge branch 'fixes'
2005-10-21 Merge branch 'fixes'
2005-10-18 Update documentation for C-style quoting.
2005-10-18 Merge branch 'fixes'
2005-10-16 Merge branch 'fixes'
2005-10-16 Merge branch 'svn' of netz.smurf.noris.de/git/git
2005-10-15 Merge branch 'fixes'
2005-10-12 Merge branch 'fixes'
2005-10-10 Merge branch 'fixes'
2005-10-10 Convert usage of GIT and Git into git
2005-10-05 Merge branch 'fixes'
2005-10-05 Merge branch 'fixes'
next