diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-26 10:35:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-26 10:35:07 -0700 |
| commit | 4579a0547cc558bd0e341adb77897e1f2f331f78 (patch) | |
| tree | 4ce984365e8935077422adcff522a2ac31c7ea03 /builtin/merge.c | |
| parent | Merge branch 'jc/commit-hook-authorship' into maint (diff) | |
| parent | add--interactive: ignore unmerged entries in patch mode (diff) | |
| download | tgif-4579a0547cc558bd0e341adb77897e1f2f331f78.tar.xz | |
Merge branch 'jk/add-p-skip-conflicts' into maint
"git add -p" is not designed to deal with unmerged paths but did
not exclude them and tried to apply funny patches only to fail.
By Jeff King
* jk/add-p-skip-conflicts:
add--interactive: ignore unmerged entries in patch mode
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions