| commit | 3a9156adc774f28b3b0f880cdd285a7e01118d15 | |
| author | Kaartic Sivaraam <kaartic.sivaraam@gmail.com> | |
| Sat, 16 Dec 2017 09:03:17 +0000 (16 14:33 +0530) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Dec 2017 18:02:14 +0000 (19 10:02 -0800) | ||
| tree | d517f2d0739b1043a14fdf276059b702f3f8c043 | treesnapshot (tar.gz zip) |
| parent | 52015aaf9d19c97b52c47c7046058e6d029ff856 | commitdiff |
rebase: consistently use branch_name variable
The variable "branch_name" holds the <branch> parameter in "git
rebase <upstream> <branch>", but one codepath did not use it after
assigning $1 to it (instead it kept using $1). Make it use the
variable consistently.
Also, update an error message to say there is no such branch or
commit, as we are expecting either of them, and not limiting
ourselves to a branch name.
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The variable "branch_name" holds the <branch> parameter in "git
rebase <upstream> <branch>", but one codepath did not use it after
assigning $1 to it (instead it kept using $1). Make it use the
variable consistently.
Also, update an error message to say there is no such branch or
commit, as we are expecting either of them, and not limiting
ourselves to a branch name.
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase.sh | diffblobblamehistory |