Skip to content
Permalink
Browse files

Merge pull request #1864 from dscho/reinstate-cousins

Two things I totally forgot
  • Loading branch information...
dscho committed Oct 4, 2018
2 parents 6c65e18 + 180b383 commit 79ff0c6229bb01c5a6992b94c9d9010cbeb08b27
Showing with 6 additions and 2 deletions.
  1. +1 −1 builtin/rebase.c
  2. +5 −1 git-gui/git-gui.sh
@@ -1035,7 +1035,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_STRING_LIST(0, "whitespace", &whitespace,
N_("whitespace"), N_("passed to 'git apply'")),
OPT_SET_INT('C', 0, &opt_c, N_("passed to 'git apply'"),
OPT_SET_INT('C', NULL, &opt_c, N_("passed to 'git apply'"),
REBASE_AM),
OPT_BOOL(0, "autostash", &options.autostash,
N_("automatically stash/stash pop before and after")),
@@ -623,7 +623,11 @@ proc git_write {args} {
}
proc githook_read {hook_name args} {
set pchook [gitdir hooks $hook_name]
if {[package vcompare $::_git_version 2.5.0] >= 0} {
set pchook [git rev-parse --git-path "hooks/$hook_name"]
} else {
set pchook [gitdir hooks $hook_name]
}
lappend args 2>@1
# On Windows [file executable] might lie so we need to ask

0 comments on commit 79ff0c6

Please sign in to comment.
You can’t perform that action at this time.