summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-26 17:24:15 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-26 17:24:15 -0700
commit3b24343a87ef1b257a74ca32af5bb9e8ef573580 (patch)
tree44e05888fe961bd82a5e18560f9a8814853460e9 /merge-tree.c
parentMerge branch 'nh/fetch-http' into next (diff)
parentAdd --continue and --abort options to git-rebase. (diff)
downloadtgif-3b24343a87ef1b257a74ca32af5bb9e8ef573580.tar.xz
Merge branch 'se/rebase' into next
* se/rebase: Add --continue and --abort options to git-rebase.
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions