summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-27 15:33:33 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-27 15:33:33 -0800
commit67f8d5b87d8ec3dcdb311f31b534332b74c93142 (patch)
tree6d77a87d8ca5045d0e539e3444b25be830115cd4 /git-rebase--merge.sh
parentMerge branch 'jn/gitweb-unborn-head' into maint (diff)
parentremote: fix set-branches usage and documentation (diff)
downloadtgif-67f8d5b87d8ec3dcdb311f31b534332b74c93142.tar.xz
Merge branch 'pj/remote-set-branches-usage-fix' into maint
* pj/remote-set-branches-usage-fix: remote: fix set-branches usage and documentation Conflicts: builtin/remote.c
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions