summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-02-06 13:43:47 -0500
committerJunio C Hamano <gitster@pobox.com>2011-02-10 14:08:09 -0800
commitfa99c1e1e16d347a354c817d96c5abbd5a08fcd8 (patch)
tree300dc5833443b31b7f22481de7f8f404fbcb46b3 /.gitignore
parentcb82a05d5e2277d2019c43cadf8abee8bc6f97b6 (diff)
downloadgit-fa99c1e1e16d347a354c817d96c5abbd5a08fcd8.tar.gz
rebase: extract merge code to new source file
Extract the code for merge-based rebase to git-rebase--merge.sh. Suggested-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3dd6ef7d25..a8b98b45e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,6 +103,7 @@
/git-read-tree
/git-rebase
/git-rebase--interactive
+/git-rebase--merge
/git-receive-pack
/git-reflog
/git-relink