mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 15:01:31 +02:00
Code

Merge branch 'jk/pull-rebase-with-work-tree' into maint

Browse Source 
* jk/pull-rebase-with-work-tree:
  pull,rebase: handle GIT_WORK_TREE better

Conflicts:
	git-pull.sh
This commit is contained in:
Junio C Hamano 2011-11-01 16:11:00 -07:00
commit 0814d6e554
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-pull.sh
View File

@ -11,7 +11,7 @@ OPTIONS_SPEC=
. git-sh-setup
. git-sh-i18n
set_reflog_action "pull${1+ $*}"
require_work_tree
require_work_tree_exists
cd_to_toplevel

2
git-rebase.sh
View File

@ -63,7 +63,7 @@ skip! skip current patch and continue
"
. git-sh-setup
set_reflog_action rebase
require_work_tree
require_work_tree_exists
cd_to_toplevel
LF='