Merge my and Petr's git-merge-one-file-script modifications
[gitweb.git] / git-resolve-script
2005-06-08 Make "git commit" work correctly in the presense of...
2005-06-08 Make default merge messages denser.
2005-06-07 git-resolve-script: stop when the automated merge fails
2005-06-07 git-resolve-script: don't wait for three seconds any...
2005-06-06 More work on merging with git-read-tree..
2005-06-06 git-read-tree: be a lot more careful about merging...
2005-05-31 git-resolve-script: use "git-apply --stat" instead...
2005-05-25 [PATCH] optimize git-resolve-script
2005-05-11 Merge ... http://members.cox.net/junkio/git-jc.git
2005-05-10 Introduce GIT_DIR environment variable.
2005-05-06 Merge of http://members.cox.net/junkio/git-jc.git
2005-05-05 Fix git-resolve-script.
2005-05-05 Split "git-pull-script" into two parts