aboutsummaryrefslogtreecommitdiff
path: root/git-pull.sh
Commit message (Expand)AuthorAge
* Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-20
|\
| * pull: Fix parsing of -X<option>Junio C Hamano2010-01-17
| * Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2010-01-17
* | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-12
* | Merge branch 'maint'Junio C Hamano2009-12-08
|\ \
| * | pull: clarify advice for the unconfigured error caseJan Krüger2009-12-03
* | | Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano2009-12-08
* | | git-pull.sh: Fix call to git-merge for new command formatHorst H. von Brand2009-12-02
| |/ |/|
* | Merge branch 'fc/doc-fast-forward'Junio C Hamano2009-11-15
|\ \
| * | Use 'fast-forward' all over the placeFelipe Contreras2009-10-24
| |/
* | Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson2009-10-30
|/
* pull: improve advice for unconfigured error caseJeff King2009-10-09
* git-pull: dead code removalJunio C Hamano2009-10-05
* pull: Clarify "helpful" message for another corner casev1.6.5-rc2Junio C Hamano2009-09-22
* allow pull --rebase on branch yet to be bornJeff King2009-08-12
* pull: support rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-19
* Merge branch 'sb/pull-rebase'Junio C Hamano2009-06-20
|\
| * parse-remote: function to get the tracking branch to be mergeSanti Béjar2009-06-11
* | pull, rebase: simplify to use die()Stephen Boyd2009-06-14
|/
* Convert to use quiet option when availableDan Loewenherz2009-04-22
* Merge branch 'maint'Junio C Hamano2009-04-08
|\
| * git-pull.sh: better warning message for "git pull" on detached head.Matthieu Moy2009-04-08
* | git-pull: Allow --stat and --no-stat to be used with --rebaseTor Arne Vestbø2009-03-02
|/
* disallow providing multiple upstream branches to rebase, pull --rebaseJay Soffian2009-02-18
* pull: use git rev-parse -qMiklos Vajna2008-12-03
* Retain multiple -q/-v occurrences in git pullTuncer Ayaz2008-11-18
* Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz2008-11-14
* pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano2008-10-17
* Ignore dirty submodule states in "git pull --rebase"Johannes Schindelin2008-07-23
* Make usage strings dash-lessStephan Beyer2008-07-13
* pull --rebase: exit early when the working directory is dirtyJohannes Schindelin2008-05-22
* merge, pull: add '--(no-)log' command line optionSZEDER Gábor2008-04-12
* merge, pull: introduce '--(no-)stat' optionSZEDER Gábor2008-04-12
* pull: pass --strategy along to to rebaseJay Soffian2008-02-22
* pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin2008-01-26
* "git pull --tags": error out with a better message.Junio C Hamano2007-12-28
* Teach 'git pull' about --rebaseJohannes Schindelin2007-11-28
* scripts: Add placeholders for OPTIONS_SPECJunio C Hamano2007-11-06
* Teach git-pull about --[no-]ff, --no-squash and --commitLars Hjemli2007-10-29
* Make git-pull complain and give advice when there is nothing to merge withFederico Mena Quintero2007-10-02
* Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-23
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* Add a configuration option to control diffstat after mergeAlex Riesen2007-05-24
* git-pull: disallow implicit merging to detached HEADJeff King2007-01-15
* Allow whole-tree operations to be started from a subdirectoryJunio C Hamano2007-01-12
* Disallow working directory commands in a bare repository.Shawn O. Pearce2007-01-10
* fail pull/merge early in the middle of conflicted mergeJunio C Hamano2007-01-01
* Allow git-merge to select the default strategy.Shawn O. Pearce2006-12-28
* Ensure `git-pull` fails if `git-merge` fails.Shawn O. Pearce2006-12-28
* Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce2006-12-28
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 17:06:02 +0000