Merge branch 'jk/pull-rebase-with-work-tree' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 23:11:00 +0000 (16:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 23:11:00 +0000 (16:11 -0700)
* jk/pull-rebase-with-work-tree:
  pull,rebase: handle GIT_WORK_TREE better

Conflicts:
git-pull.sh

1  2 
git-pull.sh
git-rebase.sh

diff --cc git-pull.sh
@@@ -9,9 -9,8 +9,9 @@@ LONG_USAGE='Fetch one or more remote re
  SUBDIRECTORY_OK=Yes
  OPTIONS_SPEC=
  . git-sh-setup
 -set_reflog_action "pull $*"
 +. git-sh-i18n
 +set_reflog_action "pull${1+ $*}"
- require_work_tree
+ require_work_tree_exists
  cd_to_toplevel
  
  
diff --cc git-rebase.sh
@@@ -28,42 -28,10 +28,42 @@@ Example:       git-rebase master~1 topi
  '
  
  SUBDIRECTORY_OK=Yes
 -OPTIONS_SPEC=
 +OPTIONS_KEEPDASHDASH=
 +OPTIONS_SPEC="\
 +git rebase [-i] [options] [--onto <newbase>] [<upstream>] [<branch>]
 +git rebase [-i] [options] --onto <newbase> --root [<branch>]
 +git-rebase [-i] --continue | --abort | --skip
 +--
 + Available options are
 +v,verbose!         display a diffstat of what changed upstream
 +q,quiet!           be quiet. implies --no-stat
 +onto=!             rebase onto given branch instead of upstream
 +p,preserve-merges! try to recreate merges instead of ignoring them
 +s,strategy=!       use the given merge strategy
 +no-ff!             cherry-pick all commits, even if unchanged
 +m,merge!           use merging strategies to rebase
 +i,interactive!     let the user edit the list of commits to rebase
 +f,force-rebase!    force rebase even if branch is up to date
 +X,strategy-option=! pass the argument through to the merge strategy
 +stat!              display a diffstat of what changed upstream
 +n,no-stat!         do not show diffstat of what changed upstream
 +verify             allow pre-rebase hook to run
 +rerere-autoupdate  allow rerere to update index with resolved conflicts
 +root!              rebase all reachable commits up to the root(s)
 +autosquash         move commits that begin with squash!/fixup! under -i
 +committer-date-is-author-date! passed to 'git am'
 +ignore-date!       passed to 'git am'
 +whitespace=!       passed to 'git apply'
 +ignore-whitespace! passed to 'git apply'
 +C=!                passed to 'git apply'
 + Actions:
 +continue!          continue
 +abort!             abort and check out the original branch
 +skip!              skip current patch and continue
 +"
  . git-sh-setup
  set_reflog_action rebase
- require_work_tree
+ require_work_tree_exists
  cd_to_toplevel
  
  LF='