summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-08 16:43:23 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-08 16:43:23 -0700
commitbd8e265d67d93e83ee48fed565627522c1553654 (patch)
treeae1e7b666f0f6698dda7d24e10064768edbe5299 /Documentation/technical/trivial-merge.txt
parentMerge branch 'jc/bindiff' into next (diff)
parentTeach git-clean optional <paths>... parameters. (diff)
downloadtgif-bd8e265d67d93e83ee48fed565627522c1553654.tar.xz
Merge branch 'jc/clean' into next
* jc/clean: Teach git-clean optional <paths>... parameters. Separate object name errors from usage errors Documentation: {caret} fixes (git-rev-list.txt) Fix "git diff --stat" with long filenames Fix repo-config set-multivar error return path.
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions