summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-09 13:37:01 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-09 13:37:01 -0800
commit1ee740e66975adbab080301ebd364e253be3d513 (patch)
tree672932e73881b55204ec237b9047c8532d891a61 /Documentation/git-merge-tree.txt
parentMerge branch 'rs/allocate-cache-entry-individually' (diff)
parentpull: introduce a pull.rebase option to enable --rebase (diff)
downloadtgif-1ee740e66975adbab080301ebd364e253be3d513.tar.xz
Merge branch 'ab/pull-rebase-config'
* ab/pull-rebase-config: pull: introduce a pull.rebase option to enable --rebase
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions