summaryrefslogtreecommitdiff
path: root/Documentation/git-filter-branch.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-12-03 13:52:54 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-03 13:52:54 -0800
commit24807f9d5bada2475fddd153365c1debfe1309bc (patch)
tree5a16341ed3e937e0af47f57a6acbebe0df18f9cb /Documentation/git-filter-branch.txt
parentMerge branch 'th/maint-remote-update-help-string' into maint (diff)
parentuser-manual: Document that "git merge" doesn't like uncommited changes. (diff)
downloadtgif-24807f9d5bada2475fddd153365c1debfe1309bc.tar.xz
Merge branch 'mm/maint-hint-failed-merge' into maint
* mm/maint-hint-failed-merge: user-manual: Document that "git merge" doesn't like uncommited changes. merge-recursive: point the user to commit when file would be overwritten.
Diffstat (limited to 'Documentation/git-filter-branch.txt')
0 files changed, 0 insertions, 0 deletions