author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
Tue, 28 Dec 2010 09:30:41 +0000 (10:30 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 28 Dec 2010 23:05:29 +0000 (15:05 -0800) | ||
commit | f09c8fe1cd08181f4ca4df1f7cbb12cd86bfda90 | |
tree | 6c53d5184f5d24f04470fccd11b4838cf1a4d938 | tree | snapshot |
parent | eacd13e6c45d4990aa00f70ed738ab8df2eece01 | commit | diff |
rebase: extract code for writing basic state
Extrace the code for writing the state to rebase-apply/ or
rebase-merge/ when a rebase is initiated. This will make it easier to
later make both interactive and non-interactive rebase remember the
options used.
Note that non-interactive rebase stores the sha1 of the original head
in a file called orig-head, while interactive rebase stores it in a
file called head.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Extrace the code for writing the state to rebase-apply/ or
rebase-merge/ when a rebase is initiated. This will make it easier to
later make both interactive and non-interactive rebase remember the
options used.
Note that non-interactive rebase stores the sha1 of the original head
in a file called orig-head, while interactive rebase stores it in a
file called head.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--am.sh | diff | blob | history | |
git-rebase--interactive.sh | diff | blob | history | |
git-rebase--merge.sh | diff | blob | history | |
git-rebase.sh | diff | blob | history |