![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 31 Oct 2007 04:44:43 +0000 (21:44 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 31 Oct 2007 04:44:43 +0000 (21:44 -0700) | ||
| commit | 9c51414f8efb73525a6c69917f1499dab081679d | |
| tree | c10e59ae2c3257c5e5a8d108a2e4f5b6f6fe7995 | tree | snapshot |
| parent | 7eedc1c1b34bbcd72b66a5dbf10b21476c10df1a | commit | diff |
| parent | 0bdb5af7a571ee2bd71550a545632b1cb7f8f8f3 | commit | diff |
Merge branch 'maint' into HEAD
* maint:
Update GIT 1.5.3.5 Release Notes
git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
Fix --strategy parsing in git-rebase--interactive.sh
Make merge-recursive honor diff.renamelimit
cherry-pick/revert: more compact user direction message
core-tutorial: Use new syntax for git-merge.
git-merge: document but discourage the historical syntax
Prevent send-pack from segfaulting (backport from 'master')
Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example
Conflicts:
git-rebase--interactive.sh
* maint:
Update GIT 1.5.3.5 Release Notes
git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
Fix --strategy parsing in git-rebase--interactive.sh
Make merge-recursive honor diff.renamelimit
cherry-pick/revert: more compact user direction message
core-tutorial: Use new syntax for git-merge.
git-merge: document but discourage the historical syntax
Prevent send-pack from segfaulting (backport from 'master')
Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example
Conflicts:
git-rebase--interactive.sh