| Commit message (Expand) | Author | Age | Files | Lines |
* | pull: use git-rev-parse --parseopt for option parsingpt/pull-optparse | Paul Tan | 2015-06-02 | 1 | -40/+57 |
* | pull: handle git-fetch's options as well | Paul Tan | 2015-06-02 | 1 | -3/+34 |
* | Merge branch 'pt/pull-ff-vs-merge-ff' | Junio C Hamano | 2015-05-26 | 1 | -1/+4 |
|\ |
|
| * | pull: parse pull.ff as a bool or stringpt/pull-ff-vs-merge-ff | Paul Tan | 2015-05-18 | 1 | -1/+1 |
| * | pull: make pull.ff=true override merge.ff | Paul Tan | 2015-05-18 | 1 | -0/+3 |
* | | Merge branch 'pt/pull-log-n' | Junio C Hamano | 2015-05-26 | 1 | -2/+2 |
|\ \ |
|
| * | | pull: handle --log=<n>pt/pull-log-n | Paul Tan | 2015-05-18 | 1 | -2/+2 |
| |/ |
|
* | | Merge branch 'pt/pull-tags-error-diag' | Junio C Hamano | 2015-05-22 | 1 | -9/+0 |
|\ \ |
|
| * | | pull: remove --tags error in no merge candidates casept/pull-tags-error-diag | Paul Tan | 2015-05-14 | 1 | -9/+0 |
| |/ |
|
* | | Merge branch 'jc/merge' | Junio C Hamano | 2015-05-19 | 1 | -2/+1 |
|\ \ |
|
| * | | merge: deprecate 'git merge <message> HEAD <commit>' syntaxjc/merge | Junio C Hamano | 2015-04-29 | 1 | -2/+1 |
| |/ |
|
* | | *.sh: respect $GIT_INDEX_FILE | Nguyễn Thái Ngọc Duy | 2014-12-01 | 1 | -1/+1 |
|/ |
|
* | merge, pull: stop advising 'commit -a' in case of conflictmm/discourage-commit-a-to-finish-conflict-resolution | Matthieu Moy | 2014-08-28 | 1 | -1/+1 |
* | Sync with maint | Junio C Hamano | 2014-06-12 | 1 | -2/+0 |
|\ |
|
| * | pull: do not abuse 'break' inside a shell 'case' | Jacek Konieczny | 2014-06-12 | 1 | -2/+0 |
* | | git-pull.sh: use the $( ... ) construct for command substitution | Elia Pinto | 2014-04-23 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'bc/gpg-sign-everywhere' | Junio C Hamano | 2014-02-27 | 1 | -1/+12 |
|\ |
|
| * | pull: add the --gpg-sign option.bc/gpg-sign-everywhere | brian m. carlson | 2014-02-11 | 1 | -1/+12 |
* | | Merge branch 'da/pull-ff-configuration' | Junio C Hamano | 2014-02-27 | 1 | -1/+16 |
|\ \
| |/
|/| |
|
| * | pull: add --ff-only to the help textda/pull-ff-configuration | David Aguilar | 2014-01-15 | 1 | -1/+1 |
| * | pull: add pull.ff configuration | David Aguilar | 2014-01-15 | 1 | -0/+15 |
* | | Merge branch 'jk/pull-rebase-using-fork-point' | Junio C Hamano | 2014-01-17 | 1 | -1/+1 |
|\ \ |
|
| * | | pull: suppress error when no remoteref is foundjk/pull-rebase-using-fork-point | John Keeping | 2014-01-17 | 1 | -1/+1 |
* | | | Merge branch 'jk/pull-rebase-using-fork-point' | Junio C Hamano | 2013-12-27 | 1 | -9/+1 |
|\ \ \
| |/ / |
|
| * | | pull: use merge-base --fork-point when appropriate | John Keeping | 2013-12-09 | 1 | -9/+1 |
| |/ |
|
* | | fetch --tags: fetch tags *in addition to* other stuff | Michael Haggerty | 2013-10-30 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'fc/trivial' | Junio C Hamano | 2013-09-17 | 1 | -3/+2 |
|\ |
|
| * | pull: use $curr_branch_short more | René Scharfe | 2013-09-08 | 1 | -3/+2 |
* | | pull: allow pull to preserve merges when rebasingsh/pull-rebase-preserve | Stephen Haberman | 2013-09-04 | 1 | -5/+26 |
|/ |
|
* | Merge branch 'jk/pull-to-integrate' | Junio C Hamano | 2013-07-12 | 1 | -1/+1 |
|\ |
|
| * | pull: change the description to "integrate" changesjk/pull-to-integrate | John Keeping | 2013-07-08 | 1 | -1/+1 |
* | | Merge branch 'jk/pull-into-dirty-unborn' | Junio C Hamano | 2013-06-27 | 1 | -2/+9 |
|\ \
| |/
|/| |
|
| * | pull: merge into unborn by fast-forwarding from empty tree | Thomas Rast | 2013-06-20 | 1 | -1/+8 |
| * | pull: update unborn branch tip after index | Jeff King | 2013-06-20 | 1 | -2/+2 |
* | | merge/pull: verify GPG signatures of commits being merged | Sebastian Götte | 2013-03-31 | 1 | -2/+8 |
|/ |
|
* | pull: Apply -q and -v options to rebase mode as well | Peter Eisentraut | 2013-03-16 | 1 | -1/+1 |
* | git-pull: Avoid merge-base on detached head | Phil Hord | 2012-10-25 | 1 | -0/+1 |
* | Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-message | Carlos Martín Nieto | 2012-03-04 | 1 | -1/+1 |
* | "git pull" doesn't know "--edit"lt/pull-no-edit | Linus Torvalds | 2012-02-12 | 1 | -2/+6 |
* | Merge branch 'ab/pull-rebase-config' | Junio C Hamano | 2011-12-09 | 1 | -0/+4 |
|\ |
|
| * | pull: introduce a pull.rebase option to enable --rebaseab/pull-rebase-config | Ævar Arnfjörð Bjarmason | 2011-11-07 | 1 | -0/+4 |
* | | Merge branch 'jk/pull-rebase-with-work-tree' | Junio C Hamano | 2011-10-17 | 1 | -1/+1 |
|\ \ |
|
| * | | pull,rebase: handle GIT_WORK_TREE better | Jeff King | 2011-10-13 | 1 | -1/+1 |
* | | | use -h for synopsis and --help for manpage consistentlycb/do-not-pretend-to-hijack-long-help | Clemens Buchacher | 2011-10-05 | 1 | -1/+1 |
* | | | Merge branch 'js/i18n-scripts' | Junio C Hamano | 2011-08-25 | 1 | -5/+2 |
|\ \ \ |
|
| * | | | pull: take advantage of eval_gettextln | Jon Seymour | 2011-08-08 | 1 | -5/+2 |
* | | | | Merge branch 'oa/pull-reflog' | Junio C Hamano | 2011-08-08 | 1 | -1/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | pull: remove extra space from reflog message | Ori Avtalion | 2011-08-01 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | i18n: git-pull eval_gettext + warning message | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -3/+6 |
* | | | i18n: git-pull eval_gettext + die message | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -3/+3 |