diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-16 23:38:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-20 18:16:27 -0700 |
| commit | f887564ab72e107bcdee3ba83c91e2bb4ae13ca7 (patch) | |
| tree | eae844ac1f369bf699f35150e6f3808a4180e55e /git-external-diff-script | |
| parent | Make time-based commit filtering work with topological ordering. (diff) | |
| download | git-f887564ab72e107bcdee3ba83c91e2bb4ae13ca7.tar.gz git-f887564ab72e107bcdee3ba83c91e2bb4ae13ca7.zip | |
Use git-merge instead of git-resolve in git-pull.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-external-diff-script')
0 files changed, 0 insertions, 0 deletions