diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-08-18 23:32:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-18 23:32:58 -0700 |
| commit | 09ba7b2d9fc9142a2195082dd0e74c8161b6b744 (patch) | |
| tree | b1a787a2fe289c10c7cf70e27239fc02999a159f /combine-diff.c | |
| parent | graph API: use a new color when starting a brand new column (diff) | |
| parent | add -p: do not attempt to coalesce mode changes (diff) | |
| download | tgif-09ba7b2d9fc9142a2195082dd0e74c8161b6b744.tar.xz | |
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
* tr/maint-1.6.3-add-p-modeonly-fix:
add -p: do not attempt to coalesce mode changes
git add -p: demonstrate failure when staging both mode and hunk
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions