aboutsummaryrefslogtreecommitdiff
path: root/git-pull.sh
Commit message (Expand)AuthorAge
* Merge branch 'pt/pull-ff-vs-merge-ff'Junio C Hamano2015-05-26
|\
| * pull: parse pull.ff as a bool or stringPaul Tan2015-05-18
| * pull: make pull.ff=true override merge.ffPaul Tan2015-05-18
* | Merge branch 'pt/pull-log-n'Junio C Hamano2015-05-26
|\ \
| * | pull: handle --log=<n>Paul Tan2015-05-18
| |/
* | Merge branch 'pt/pull-tags-error-diag'Junio C Hamano2015-05-22
|\ \
| * | pull: remove --tags error in no merge candidates casePaul Tan2015-05-14
| |/
* | Merge branch 'jc/merge'Junio C Hamano2015-05-19
|\ \
| * | merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano2015-04-29
| |/
* | *.sh: respect $GIT_INDEX_FILENguyễn Thái Ngọc Duy2014-12-01
|/
* merge, pull: stop advising 'commit -a' in case of conflictMatthieu Moy2014-08-28
* Sync with maintJunio C Hamano2014-06-12
|\
| * pull: do not abuse 'break' inside a shell 'case'Jacek Konieczny2014-06-12
* | git-pull.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-23
|/
* Merge branch 'bc/gpg-sign-everywhere'Junio C Hamano2014-02-27
|\
| * pull: add the --gpg-sign option.brian m. carlson2014-02-11
* | Merge branch 'da/pull-ff-configuration'Junio C Hamano2014-02-27
|\ \ | |/ |/|
| * pull: add --ff-only to the help textDavid Aguilar2014-01-15
| * pull: add pull.ff configurationDavid Aguilar2014-01-15
* | Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano2014-01-17
|\ \
| * | pull: suppress error when no remoteref is foundJohn Keeping2014-01-17
* | | Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano2013-12-27
|\ \ \ | |/ /
| * | pull: use merge-base --fork-point when appropriateJohn Keeping2013-12-09
| |/
* | fetch --tags: fetch tags *in addition to* other stuffMichael Haggerty2013-10-30
|/
* Merge branch 'fc/trivial'Junio C Hamano2013-09-17
|\
| * pull: use $curr_branch_short moreRené Scharfe2013-09-08
* | pull: allow pull to preserve merges when rebasingStephen Haberman2013-09-04
|/
* Merge branch 'jk/pull-to-integrate'Junio C Hamano2013-07-12
|\
| * pull: change the description to "integrate" changesJohn Keeping2013-07-08
* | Merge branch 'jk/pull-into-dirty-unborn'Junio C Hamano2013-06-27
|\ \ | |/ |/|
| * pull: merge into unborn by fast-forwarding from empty treeThomas Rast2013-06-20
| * pull: update unborn branch tip after indexJeff King2013-06-20
* | merge/pull: verify GPG signatures of commits being mergedSebastian Götte2013-03-31
|/
* pull: Apply -q and -v options to rebase mode as wellPeter Eisentraut2013-03-16
* git-pull: Avoid merge-base on detached headPhil Hord2012-10-25
* Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto2012-03-04
* "git pull" doesn't know "--edit"Linus Torvalds2012-02-12
* Merge branch 'ab/pull-rebase-config'Junio C Hamano2011-12-09
|\
| * pull: introduce a pull.rebase option to enable --rebaseÆvar Arnfjörð Bjarmason2011-11-07
* | Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano2011-10-17
|\ \
| * | pull,rebase: handle GIT_WORK_TREE betterJeff King2011-10-13
* | | use -h for synopsis and --help for manpage consistentlyClemens Buchacher2011-10-05
* | | Merge branch 'js/i18n-scripts'Junio C Hamano2011-08-25
|\ \ \
| * | | pull: take advantage of eval_gettextlnJon Seymour2011-08-08
* | | | Merge branch 'oa/pull-reflog'Junio C Hamano2011-08-08
|\ \ \ \ | |/ / / |/| | |
| * | | pull: remove extra space from reflog messageOri Avtalion2011-08-01
| | |/ | |/|
* | | i18n: git-pull eval_gettext + warning messageÆvar Arnfjörð Bjarmason2011-05-21
* | | i18n: git-pull eval_gettext + die messageÆvar Arnfjörð Bjarmason2011-05-21
* | | i18n: git-pull die messagesÆvar Arnfjörð Bjarmason2011-05-21
* | | i18n: git-pull add git-sh-i18nÆvar Arnfjörð Bjarmason2011-05-21
|/ /