Created
August 22, 2011 18:33
-
-
Save rtlong/1163118 to your computer and use it in GitHub Desktop.
issue with git rebase -i
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is meant to supplement the question on StackOverflow, here: | |
http://stackoverflow.com/questions/7137985/git-rebase-i-head7-showing-only-noop-in-editor |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git rebase -i HEAD~7 | |
+ OPTIONS_KEEPDASHDASH= | |
+ OPTIONS_SPEC=git-rebase [-i] [options] [--] <upstream> [<branch>] | |
git-rebase [-i] (--continue | --abort | --skip) | |
-- | |
Available options are | |
v,verbose display a diffstat of what changed upstream | |
onto= rebase onto given branch instead of upstream | |
p,preserve-merges try to recreate merges instead of ignoring them | |
s,strategy= use the given merge strategy | |
no-ff cherry-pick all commits, even if unchanged | |
m,merge always used (no-op) | |
i,interactive always used (no-op) | |
Actions: | |
continue continue rebasing process | |
abort abort rebasing process and restore original branch | |
skip skip current patch and continue rebasing process | |
no-verify override pre-rebase hook from stopping the operation | |
verify allow pre-rebase hook to run | |
root rebase all reachable commmits up to the root(s) | |
autosquash move commits that begin with squash!/fixup! under -i | |
+ . git-sh-setup | |
+ unset CDPATH | |
+ GIT_QUIET= | |
+ test -n git-rebase [-i] [options] [--] <upstream> [<branch>] | |
git-rebase [-i] (--continue | --abort | --skip) | |
-- | |
Available options are | |
v,verbose display a diffstat of what changed upstream | |
onto= rebase onto given branch instead of upstream | |
p,preserve-merges try to recreate merges instead of ignoring them | |
s,strategy= use the given merge strategy | |
no-ff cherry-pick all commits, even if unchanged | |
m,merge always used (no-op) | |
i,interactive always used (no-op) | |
Actions: | |
continue continue rebasing process | |
abort abort rebasing process and restore original branch | |
skip skip current patch and continue rebasing process | |
no-verify override pre-rebase hook from stopping the operation | |
verify allow pre-rebase hook to run | |
root rebase all reachable commmits up to the root(s) | |
autosquash move commits that begin with squash!/fixup! under -i | |
+ parseopt_extra= | |
+ [ -n ] | |
+ echo git-rebase [-i] [options] [--] <upstream> [<branch>] | |
git-rebase [-i] (--continue | --abort | --skip) | |
-- | |
Available options are | |
v,verbose display a diffstat of what changed upstream | |
onto= rebase onto given branch instead of upstream | |
p,preserve-merges try to recreate merges instead of ignoring them | |
s,strategy= use the given merge strategy | |
no-ff cherry-pick all commits, even if unchanged | |
m,merge always used (no-op) | |
i,interactive always used (no-op) | |
Actions: | |
continue continue rebasing process | |
abort abort rebasing process and restore original branch | |
skip skip current patch and continue rebasing process | |
no-verify override pre-rebase hook from stopping the operation | |
verify allow pre-rebase hook to run | |
root rebase all reachable commmits up to the root(s) | |
autosquash move commits that begin with squash!/fixup! under -i | |
+ git rev-parse --parseopt -- -i HEAD~7 | |
+ eval set -- -i -- 'HEAD~7' | |
+ set -- -i -- HEAD~7 | |
+ test -z | |
+ git rev-parse --git-dir | |
+ GIT_DIR=.git | |
+ [ -z ] | |
+ git rev-parse --show-cdup | |
+ test -z | |
+ test -n .git | |
+ cd .git | |
+ pwd | |
+ GIT_DIR=/home/ryan/Projects/social-jobs/.git | |
+ : /home/ryan/Projects/social-jobs/.git/objects | |
+ uname -s | |
+ require_work_tree | |
+ git rev-parse --is-inside-work-tree | |
+ test true = true | |
+ DOTEST=/home/ryan/Projects/social-jobs/.git/rebase-merge | |
+ TODO=/home/ryan/Projects/social-jobs/.git/rebase-merge/git-rebase-todo | |
+ DONE=/home/ryan/Projects/social-jobs/.git/rebase-merge/done | |
+ MSG=/home/ryan/Projects/social-jobs/.git/rebase-merge/message | |
+ SQUASH_MSG=/home/ryan/Projects/social-jobs/.git/rebase-merge/message-squash | |
+ FIXUP_MSG=/home/ryan/Projects/social-jobs/.git/rebase-merge/message-fixup | |
+ REWRITTEN=/home/ryan/Projects/social-jobs/.git/rebase-merge/rewritten | |
+ DROPPED=/home/ryan/Projects/social-jobs/.git/rebase-merge/dropped | |
+ AUTHOR_SCRIPT=/home/ryan/Projects/social-jobs/.git/rebase-merge/author-script | |
+ AMEND=/home/ryan/Projects/social-jobs/.git/rebase-merge/amend | |
+ REWRITTEN_LIST=/home/ryan/Projects/social-jobs/.git/rebase-merge/rewritten-list | |
+ REWRITTEN_PENDING=/home/ryan/Projects/social-jobs/.git/rebase-merge/rewritten-pending | |
+ PRESERVE_MERGES= | |
+ STRATEGY= | |
+ ONTO= | |
+ VERBOSE= | |
+ OK_TO_SKIP_PRE_REBASE= | |
+ REBASE_ROOT= | |
+ AUTOSQUASH= | |
+ git config --bool rebase.autosquash | |
+ test = true | |
+ NEVER_FF= | |
+ GIT_CHERRY_PICK_HELP=hint: after resolving the conflicts, mark the corrected paths | |
hint: with 'git add <paths>' and run 'git rebase --continue' | |
+ export GIT_CHERRY_PICK_HELP | |
+ ORIG_REFLOG_ACTION=rebase | |
+ last_count= | |
+ LF= | |
+ test 3 != 0 | |
+ shift | |
+ test 2 != 0 | |
+ shift | |
+ test -z -a 1 -ge 1 -a 1 -le 2 | |
+ test -d /home/ryan/Projects/social-jobs/.git/rebase-merge | |
+ git var GIT_COMMITTER_IDENT | |
+ test -z | |
+ UPSTREAM_ARG=HEAD~7 | |
+ git rev-parse --verify HEAD~7 | |
+ UPSTREAM=2c51946812a198ca908ebcad2308e4b8274624b3 | |
+ test -z | |
+ ONTO=2c51946812a198ca908ebcad2308e4b8274624b3 | |
+ shift | |
+ run_pre_rebase_hook HEAD~7 | |
+ test -z | |
+ test -x /home/ryan/Projects/social-jobs/.git/hooks/pre-rebase | |
+ comment_for_reflog start | |
+ GIT_REFLOG_ACTION=rebase -i (start) | |
+ export GIT_REFLOG_ACTION | |
+ require_clean_work_tree rebase Please commit or stash them. | |
+ git rev-parse --verify HEAD | |
+ git update-index -q --ignore-submodules --refresh | |
+ err=0 | |
+ git diff-files --quiet --ignore-submodules | |
+ git diff-index --cached --quiet --ignore-submodules HEAD -- | |
+ [ 0 = 1 ] | |
+ test ! -z | |
+ git rev-parse --verify HEAD | |
+ HEAD=d0e9ff6d9c1f8bc374856ca2a84ad52d6013b5bf | |
+ mkdir /home/ryan/Projects/social-jobs/.git/rebase-merge | |
+ : | |
+ git symbolic-ref HEAD | |
+ echo d0e9ff6d9c1f8bc374856ca2a84ad52d6013b5bf | |
+ rm -f /home/ryan/Projects/social-jobs/.git/rebase-merge/rebase-root | |
+ echo 2c51946812a198ca908ebcad2308e4b8274624b3 | |
+ test -z | |
+ test t = | |
+ test t = | |
+ MERGES_OPTION=--no-merges --cherry-pick | |
+ git rev-parse --short d0e9ff6d9c1f8bc374856ca2a84ad52d6013b5bf | |
+ SHORTHEAD=d0e9ff6 | |
+ git rev-parse --short 2c51946812a198ca908ebcad2308e4b8274624b3 | |
+ SHORTONTO=2c51946 | |
+ test -z | |
+ git rev-parse --short 2c51946812a198ca908ebcad2308e4b8274624b3 | |
+ SHORTUPSTREAM=2c51946 | |
+ REVISIONS=2c51946812a198ca908ebcad2308e4b8274624b3...d0e9ff6d9c1f8bc374856ca2a84ad52d6013b5bf | |
+ SHORTREVISIONS=2c51946..d0e9ff6 | |
+ read -r shortsha1 rest | |
+ sed -n s/^>//p | |
+ git rev-list --no-merges --cherry-pick --pretty=oneline --abbrev-commit --abbrev=7 --reverse --left-right --topo-order 2c51946812a198ca908ebcad2308e4b8274624b3...d0e9ff6d9c1f8bc374856ca2a84ad52d6013b5bf | |
usage: git rev-list [OPTION] <commit-id>... [ -- paths... ] | |
limiting output: | |
--max-count=<n> | |
--max-age=<epoch> | |
--min-age=<epoch> | |
--sparse | |
--no-merges | |
--remove-empty | |
--all | |
--branches | |
--tags | |
--remotes | |
--stdin | |
--quiet | |
ordering output: | |
--topo-order | |
--date-order | |
--reverse | |
formatting output: | |
--parents | |
--children | |
--objects | --objects-edge | |
--unpacked | |
--header | --pretty | |
--abbrev=<n> | --no-abbrev | |
--abbrev-commit | |
--left-right | |
special purpose: | |
--bisect | |
--bisect-vars | |
--bisect-all | |
+ test t = | |
+ test -s /home/ryan/Projects/social-jobs/.git/rebase-merge/git-rebase-todo | |
+ echo noop | |
+ test -n | |
+ cat | |
+ has_action /home/ryan/Projects/social-jobs/.git/rebase-merge/git-rebase-todo | |
+ sane_grep ^[^#] /home/ryan/Projects/social-jobs/.git/rebase-merge/git-rebase-todo | |
+ GREP_OPTIONS= LC_ALL=C grep ^[^#] /home/ryan/Projects/social-jobs/.git/rebase-merge/git-rebase-todo | |
+ cp /home/ryan/Projects/social-jobs/.git/rebase-merge/git-rebase-todo /home/ryan/Projects/social-jobs/.git/rebase-merge/git-rebase-todo.backup | |
+ git_editor /home/ryan/Projects/social-jobs/.git/rebase-merge/git-rebase-todo | |
+ test -z | |
+ git var GIT_EDITOR | |
+ GIT_EDITOR=nano | |
+ eval nano "$@" | |
+ nano /home/ryan/Projects/social-jobs/.git/rebase-merge/git-rebase-todo | |
+ has_action /home/ryan/Projects/social-jobs/.git/rebase-merge/git-rebase-todo | |
+ sane_grep ^[^#] /home/ryan/Projects/social-jobs/.git/rebase-merge/git-rebase-todo | |
+ GREP_OPTIONS= LC_ALL=C grep ^[^#] /home/ryan/Projects/social-jobs/.git/rebase-merge/git-rebase-todo | |
+ die_abort Nothing to do | |
+ rm -rf /home/ryan/Projects/social-jobs/.git/rebase-merge | |
+ die Nothing to do | |
+ echo Nothing to do | |
Nothing to do | |
+ exit 1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment