[PATCH] Update Thunderbird specific hints.
[git.git] / git-resolve-script
2005-08-29 Junio C HamanoMerge refs/heads/portable from cs.berkeley.edu/~ejr...
2005-08-24 Junio C HamanoMerge refs/heads/master from .
2005-08-24 Junio C HamanoTry to find the optimum merge base while resolving.
2005-08-20 Junio C HamanoMerge with master to pick up commit hook works.
2005-08-20 Junio C Hamanogit-resolve: dying is good, not showing help is bad.
2005-08-19 Junio C HamanoMerge from gitk
2005-08-18 Junio C HamanoMerge with gitk --parents change.
2005-08-18 Junio C HamanoMerge with gitk
2005-08-14 Junio C HamanoMerge master into rc
2005-08-14 Linus Torvalds[PATCH] Make sure git-resolve-script always works on...
2005-08-12 Junio C HamanoMerge with gitk.
2005-08-10 Junio C HamanoMerge with gitk.
2005-08-09 Junio C HamanoMerge with gitk.
2005-08-08 Junio C HamanoMerge with gitk.
2005-08-07 Junio C HamanoMerge with gitk.
2005-08-06 Junio C HamanoMerge with gitk.
2005-08-05 Junio C HamanoMerge with gitk.
2005-07-31 Junio C HamanoMerge with gitk.
2005-07-29 Junio C HamanoMerge with gitk.
2005-07-23 Junio C Hamano[PATCH] Audit rev-parse users.
2005-07-18 Linus TorvaldsMerge master.kernel.org:/pub/scm/gitk/gitk
2005-07-16 Linus TorvaldsMerge git-tools repository under "tools" subdirectory
2005-07-09 Linus TorvaldsMake "git resolve" take the merge message in $3
2005-07-08 Linus TorvaldsAdd "git-sh-setup-script" for common git shell script...
2005-07-06 Linus TorvaldsMerge master.kernel.org:/pub/scm/gitk/gitk
2005-06-28 Linus TorvaldsMerge rsync://rsync.kernel.org/pub/scm/gitk/gitk
2005-06-22 Linus TorvaldsDo a cross-project merge of Paul Mackerras' gitk visualizer
2005-06-21 Linus TorvaldsClean up different special *HEAD handling
2005-06-20 Dan Holmsand[PATCH] git-resolve-script: Add LAST_MERGE and use...
2005-06-20 Linus TorvaldsClean up MERGE_HEAD and ORIG_HEAD also for the trivial...
2005-06-15 Linus TorvaldsTrivial git script fixups
2005-06-08 Linus TorvaldsMake "git commit" work correctly in the presense of...
2005-06-08 Linus TorvaldsMake default merge messages denser.
2005-06-07 Linus Torvaldsgit-resolve-script: stop when the automated merge fails
2005-06-07 Linus Torvaldsgit-resolve-script: don't wait for three seconds any...
2005-06-06 Linus TorvaldsMore work on merging with git-read-tree..
2005-06-06 Linus Torvaldsgit-read-tree: be a lot more careful about merging...
2005-05-31 Linus Torvaldsgit-resolve-script: use "git-apply --stat" instead...
2005-05-25 Jeff Garzik[PATCH] optimize git-resolve-script
2005-05-11 Petr BaudisMerge ... http://members.cox.net/junkio/git-jc.git
2005-05-10 Junio C HamanoIntroduce GIT_DIR environment variable.
2005-05-06 Linus TorvaldsMerge of http://members.cox.net/junkio/git-jc.git
2005-05-05 Linus TorvaldsFix git-resolve-script.
2005-05-05 Linus TorvaldsSplit "git-pull-script" into two parts