diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2012-06-26 07:51:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-26 13:17:50 -0700 |
| commit | 572a7c52bb12e22b3b8471133253b9884643a4e2 (patch) | |
| tree | a02f63ebd6e335358fa7273aefcc4a9bd96be899 /git-rebase--merge.sh | |
| parent | bc9e7dd41fe8b51cc7f2e79312a2ff777899f930 (diff) | |
| download | git-572a7c52bb12e22b3b8471133253b9884643a4e2.tar.gz | |
rebase: don't source git-sh-setup twice
The git-sh-setup script is already sourced in git-rebase.sh before
calling into git-rebase--(am|interactive|merge).sh. There are no other
callers of these scripts. It is therefore unnecessary to source
git-sh-setup again in them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index dc599077f0..b10f2cf21b 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -3,8 +3,6 @@ # Copyright (c) 2010 Junio C Hamano. # -. git-sh-setup - prec=4 read_state () { |