summaryrefslogtreecommitdiff
path: root/git-pull.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pt/pull-ff-vs-merge-ff'Junio C Hamano2015-05-261-1/+4
|\
| * pull: parse pull.ff as a bool or stringpt/pull-ff-vs-merge-ffPaul Tan2015-05-181-1/+1
| * pull: make pull.ff=true override merge.ffPaul Tan2015-05-181-0/+3
* | Merge branch 'pt/pull-log-n'Junio C Hamano2015-05-261-2/+2
|\ \
| * | pull: handle --log=<n>pt/pull-log-nPaul Tan2015-05-181-2/+2
| |/
* | Merge branch 'pt/pull-tags-error-diag'Junio C Hamano2015-05-221-9/+0
|\ \
| * | pull: remove --tags error in no merge candidates casept/pull-tags-error-diagPaul Tan2015-05-141-9/+0
| |/
* | Merge branch 'jc/merge'Junio C Hamano2015-05-191-2/+1
|\ \
| * | merge: deprecate 'git merge <message> HEAD <commit>' syntaxjc/mergeJunio C Hamano2015-04-291-2/+1
| |/
* | *.sh: respect $GIT_INDEX_FILENguyễn Thái Ngọc Duy2014-12-011-1/+1
|/
* merge, pull: stop advising 'commit -a' in case of conflictmm/discourage-commit-a-to-finish-conflict-resolutionMatthieu Moy2014-08-281-1/+1
* Sync with maintJunio C Hamano2014-06-121-2/+0
|\
| * pull: do not abuse 'break' inside a shell 'case'Jacek Konieczny2014-06-121-2/+0
* | git-pull.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-1/+1
|/
* Merge branch 'bc/gpg-sign-everywhere'Junio C Hamano2014-02-271-1/+12
|\
| * pull: add the --gpg-sign option.bc/gpg-sign-everywherebrian m. carlson2014-02-111-1/+12
* | Merge branch 'da/pull-ff-configuration'Junio C Hamano2014-02-271-1/+16
|\ \ | |/ |/|
| * pull: add --ff-only to the help textda/pull-ff-configurationDavid Aguilar2014-01-151-1/+1
| * pull: add pull.ff configurationDavid Aguilar2014-01-151-0/+15
* | Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano2014-01-171-1/+1
|\ \
| * | pull: suppress error when no remoteref is foundjk/pull-rebase-using-fork-pointJohn Keeping2014-01-171-1/+1
* | | Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano2013-12-271-9/+1
|\ \ \ | |/ /
| * | pull: use merge-base --fork-point when appropriateJohn Keeping2013-12-091-9/+1
| |/
* | fetch --tags: fetch tags *in addition to* other stuffMichael Haggerty2013-10-301-1/+1
|/
* Merge branch 'fc/trivial'Junio C Hamano2013-09-171-3/+2
|\
| * pull: use $curr_branch_short moreRené Scharfe2013-09-081-3/+2
* | pull: allow pull to preserve merges when rebasingsh/pull-rebase-preserveStephen Haberman2013-09-041-5/+26
|/
* Merge branch 'jk/pull-to-integrate'Junio C Hamano2013-07-121-1/+1
|\
| * pull: change the description to "integrate" changesjk/pull-to-integrateJohn Keeping2013-07-081-1/+1
* | Merge branch 'jk/pull-into-dirty-unborn'Junio C Hamano2013-06-271-2/+9
|\ \ | |/ |/|
| * pull: merge into unborn by fast-forwarding from empty treeThomas Rast2013-06-201-1/+8
| * pull: update unborn branch tip after indexJeff King2013-06-201-2/+2
* | merge/pull: verify GPG signatures of commits being mergedSebastian Götte2013-03-311-2/+8
|/
* pull: Apply -q and -v options to rebase mode as wellPeter Eisentraut2013-03-161-1/+1
* git-pull: Avoid merge-base on detached headPhil Hord2012-10-251-0/+1
* Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-messageCarlos Martín Nieto2012-03-041-1/+1
* "git pull" doesn't know "--edit"lt/pull-no-editLinus Torvalds2012-02-121-2/+6
* Merge branch 'ab/pull-rebase-config'Junio C Hamano2011-12-091-0/+4
|\
| * pull: introduce a pull.rebase option to enable --rebaseab/pull-rebase-configÆvar Arnfjörð Bjarmason2011-11-071-0/+4
* | Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano2011-10-171-1/+1
|\ \
| * | pull,rebase: handle GIT_WORK_TREE betterJeff King2011-10-131-1/+1
* | | use -h for synopsis and --help for manpage consistentlycb/do-not-pretend-to-hijack-long-helpClemens Buchacher2011-10-051-1/+1
* | | Merge branch 'js/i18n-scripts'Junio C Hamano2011-08-251-5/+2
|\ \ \
| * | | pull: take advantage of eval_gettextlnJon Seymour2011-08-081-5/+2
* | | | Merge branch 'oa/pull-reflog'Junio C Hamano2011-08-081-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | pull: remove extra space from reflog messageOri Avtalion2011-08-011-1/+1
| | |/ | |/|
* | | i18n: git-pull eval_gettext + warning messageÆvar Arnfjörð Bjarmason2011-05-211-3/+6
* | | i18n: git-pull eval_gettext + die messageÆvar Arnfjörð Bjarmason2011-05-211-3/+3
* | | i18n: git-pull die messagesÆvar Arnfjörð Bjarmason2011-05-211-9/+9
* | | i18n: git-pull add git-sh-i18nÆvar Arnfjörð Bjarmason2011-05-211-0/+1
|/ /
View Lorry Controller Status