summaryrefslogtreecommitdiff
path: root/git-pull.sh
Commit message (Expand)AuthorAgeFilesLines
* Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra2010-10-281-4/+1
* Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano2010-08-211-0/+9
|\
| * pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren2010-08-121-0/+9
* | pull: do nothing on --dry-runJeff King2010-05-251-1/+6
* | Merge branch 'maint'Junio C Hamano2010-03-201-1/+1
|\ \
| * | pull: replace unnecessary sed invocationStephen Boyd2010-03-201-1/+1
| |/
* | fetch and pull: learn --progressTay Ray Chuan2010-02-241-2/+4
|/
* pull: re-fix command line generationJunio C Hamano2010-01-241-1/+1
* Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-201-5/+25
|\
| * pull: Fix parsing of -X<option>Junio C Hamano2010-01-171-7/+14
| * Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2010-01-171-2/+15
* | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-2/+23
* | Merge branch 'maint'Junio C Hamano2009-12-081-15/+33
|\ \
| * | pull: clarify advice for the unconfigured error caseJan Krüger2009-12-031-15/+33
* | | Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano2009-12-081-3/+3
* | | git-pull.sh: Fix call to git-merge for new command formatHorst H. von Brand2009-12-021-3/+3
| |/ |/|
* | Merge branch 'fc/doc-fast-forward'Junio C Hamano2009-11-151-1/+1
|\ \
| * | Use 'fast-forward' all over the placeFelipe Contreras2009-10-241-1/+1
| |/
* | Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson2009-10-301-2/+5
|/
* pull: improve advice for unconfigured error caseJeff King2009-10-091-4/+12
* git-pull: dead code removalJunio C Hamano2009-10-051-8/+1
* pull: Clarify "helpful" message for another corner casev1.6.5-rc2Junio C Hamano2009-09-221-1/+6
* allow pull --rebase on branch yet to be bornJeff King2009-08-121-5/+13
* pull: support rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-191-3/+11
* Merge branch 'sb/pull-rebase'Junio C Hamano2009-06-201-5/+2
|\
| * parse-remote: function to get the tracking branch to be mergeSanti Béjar2009-06-111-5/+2
* | pull, rebase: simplify to use die()Stephen Boyd2009-06-141-4/+2
|/
* Convert to use quiet option when availableDan Loewenherz2009-04-221-1/+1
* Merge branch 'maint'Junio C Hamano2009-04-081-17/+25
|\
| * git-pull.sh: better warning message for "git pull" on detached head.Matthieu Moy2009-04-081-17/+25
* | git-pull: Allow --stat and --no-stat to be used with --rebaseTor Arne Vestbø2009-03-021-5/+5
|/
* disallow providing multiple upstream branches to rebase, pull --rebaseJay Soffian2009-02-181-0/+5
* pull: use git rev-parse -qMiklos Vajna2008-12-031-4/+4
* Retain multiple -q/-v occurrences in git pullTuncer Ayaz2008-11-181-2/+2
* Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz2008-11-141-3/+7
* pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano2008-10-171-2/+2
* Ignore dirty submodule states in "git pull --rebase"Johannes Schindelin2008-07-231-3/+3
* Make usage strings dash-lessStephan Beyer2008-07-131-1/+1
* pull --rebase: exit early when the working directory is dirtyJohannes Schindelin2008-05-221-0/+5
* merge, pull: add '--(no-)log' command line optionSZEDER Gábor2008-04-121-3/+5
* merge, pull: introduce '--(no-)stat' optionSZEDER Gábor2008-04-121-9/+7
* pull: pass --strategy along to to rebaseJay Soffian2008-02-221-1/+2
* pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin2008-01-261-1/+11
* "git pull --tags": error out with a better message.Junio C Hamano2007-12-281-26/+40
* Teach 'git pull' about --rebaseJohannes Schindelin2007-11-281-1/+10
* scripts: Add placeholders for OPTIONS_SPECJunio C Hamano2007-11-061-0/+1
* Teach git-pull about --[no-]ff, --no-squash and --commitLars Hjemli2007-10-291-3/+11
* Make git-pull complain and give advice when there is nothing to merge withFederico Mena Quintero2007-10-021-4/+18
* Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-231-3/+3
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-8/+8
View Lorry Controller Status