summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-28 21:11:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-28 21:11:39 (GMT)
commit78c6e0f3fa41d697f2e01850b0a361e21095545d (patch)
tree672214a8fa5dfc78e80fae82e856c9f8f2f013f6 /.gitignore
parentac9666f84a597973ef29dc7f0f7edcb3e1a3aa45 (diff)
parent45e2acf3d33b2bc635f14af0c1d9ce698328954f (diff)
downloadgit-78c6e0f3fa41d697f2e01850b0a361e21095545d.zip
git-78c6e0f3fa41d697f2e01850b0a361e21095545d.tar.gz
git-78c6e0f3fa41d697f2e01850b0a361e21095545d.tar.bz2
Merge branch 'mz/rebase'
* mz/rebase: (34 commits) rebase: define options in OPTIONS_SPEC Makefile: do not install sourced rebase scripts rebase: use @{upstream} if no upstream specified rebase -i: remove unnecessary state rebase-root rebase -i: don't read unused variable preserve_merges git-rebase--am: remove unnecessary --3way option rebase -m: don't print exit code 2 when merge fails rebase -m: remember allow_rerere_autoupdate option rebase: remember strategy and strategy options rebase: remember verbose option rebase: extract code for writing basic state rebase: factor out sub command handling rebase: make -v a tiny bit more verbose rebase -i: align variable names rebase: show consistent conflict resolution hint rebase: extract am code to new source file rebase: extract merge code to new source file rebase: remove $branch as synonym for $orig_head rebase -i: support --stat rebase: factor out call to pre-rebase hook ...
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 2cf3ca5..711fce7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,7 +101,9 @@
/git-quiltimport
/git-read-tree
/git-rebase
+/git-rebase--am
/git-rebase--interactive
+/git-rebase--merge
/git-receive-pack
/git-reflog
/git-relink