summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLibravatar Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-02-06 13:43:48 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-10 14:08:09 -0800
commit46df82d5fa0f83d3c1108ad70248877d6d9b56bb (patch)
treed7780e36c5474554404623e7bcec67bd15e7b47b /.gitignore
parentrebase: extract merge code to new source file (diff)
downloadtgif-46df82d5fa0f83d3c1108ad70248877d6d9b56bb.tar.xz
rebase: extract am code to new source file
Extract the code for am-based rebase to git-rebase--am.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 a8b98b45e3..7aaf5c7383 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,6 +102,7 @@
/git-quiltimport
/git-read-tree
/git-rebase
+/git-rebase--am
/git-rebase--interactive
/git-rebase--merge
/git-receive-pack