diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-02-03 00:26:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-03 00:26:17 -0800 |
| commit | f39e4cfa2ec2bab4175cee3a9e806d8b65161c75 (patch) | |
| tree | 080aa6dcd4d42ef5e4583b7ea84f33d97efd7c1f /Documentation/gitignore.txt | |
| parent | Merge branch 'jk/maint-cleanup-after-exec-failure' (diff) | |
| parent | add -u: do not fail to resolve a path as deleted (diff) | |
| download | tgif-f39e4cfa2ec2bab4175cee3a9e806d8b65161c75.tar.xz | |
Merge branch 'jc/maint-add-u-remove-conflicted'
* jc/maint-add-u-remove-conflicted:
add -u: do not fail to resolve a path as deleted
Diffstat (limited to 'Documentation/gitignore.txt')
0 files changed, 0 insertions, 0 deletions