mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fc/trivial'

Browse Source 
* fc/trivial:
  pull: use $curr_branch_short more
  add: trivial style cleanup
  reset: trivial style cleanup
  branch: trivial style fix
  reset: trivial refactoring
This commit is contained in:
Junio C Hamano
2013-09-17 11:42:34 -07:00
parent 984ac91e72 b07f729608
commit c8ccfc9cdf
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
git-pull.sh
View File

@ -187,9 +187,8 @@ error_on_no_merge_candidates () {
op_prep=with
fi
curr_branch=${curr_branch#refs/heads/}
upstream=$(git config "branch.$curr_branch.merge")
remote=$(git config "branch.$curr_branch.remote")
upstream=$(git config "branch.$curr_branch_short.merge")
remote=$(git config "branch.$curr_branch_short.remote")
if [ $# -gt 1 ]; then
if [ "$rebase" = true ]; then