diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-08-27 17:51:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-27 17:51:05 -0700 |
| commit | b32d37a3a6817ba307062fe2f7b6d9cfb85a1ebd (patch) | |
| tree | ea8f2b5b30822c350cd9b5e6428d86ee53c706f8 /Documentation/git-resolve.txt | |
| parent | git-reset: remove unused variable (diff) | |
| parent | git-apply --reject: finishing touches. (diff) | |
| download | tgif-b32d37a3a6817ba307062fe2f7b6d9cfb85a1ebd.tar.xz | |
Merge branch 'jc/apply'
* jc/apply:
git-apply --reject: finishing touches.
apply --reject: count hunks starting from 1, not 0
git-apply --verbose
git-apply --reject: send rejects to .rej files.
git-apply --reject
apply --reverse: tie it all together.
diff.c: make binary patch reversible.
builtin-apply --reverse: two bugfixes.
Diffstat (limited to 'Documentation/git-resolve.txt')
0 files changed, 0 insertions, 0 deletions