global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-12 01:40:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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-10-17 21:37:14 -07:00
parent 0c762702a0 035b5bf643
commit f2b5163525
2 changed files with 2 additions and 2 deletions
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