summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-06-25 02:23:43 -0700
committerLibravatar Linus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 16:52:16 -0700
commit59e6b23acef9d29b9bdabc38ee80361e19ef7ebe (patch)
tree32e674e352960114da7940e79f7ba1d23d3c818e /git-resolve-script
parent[PATCH] git-cherry: find commits not merged upstream. (diff)
downloadtgif-59e6b23acef9d29b9bdabc38ee80361e19ef7ebe.tar.xz
[PATCH] git-rebase-script: rebase local commits to new upstream head.
Using git-cherry, forward port local commits missing from the new upstream head. This also depends on "-m" flag support in git-commit-script. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'git-resolve-script')
0 files changed, 0 insertions, 0 deletions