summaryrefslogtreecommitdiffstats
path: root/git-pull.sh
AgeCommit message (Expand)AuthorLines
2009-07-19pull: support rebased upstream + fetch + pull --rebaseSanti Béjar-3/+11
2009-06-20Merge branch 'sb/pull-rebase'Junio C Hamano-5/+2
2009-06-14pull, rebase: simplify to use die()Stephen Boyd-4/+2
2009-06-11parse-remote: function to get the tracking branch to be mergeSanti Béjar-5/+2
2009-04-22Convert to use quiet option when availableDan Loewenherz-1/+1
2009-04-08Merge branch 'maint'Junio C Hamano-17/+25
2009-04-08git-pull.sh: better warning message for "git pull" on detached head.Matthieu Moy-17/+25
2009-03-02git-pull: Allow --stat and --no-stat to be used with --rebaseTor Arne Vestbø-5/+5
2009-02-18disallow providing multiple upstream branches to rebase, pull --rebaseJay Soffian-0/+5
2008-12-03pull: use git rev-parse -qMiklos Vajna-4/+4
2008-11-18Retain multiple -q/-v occurrences in git pullTuncer Ayaz-2/+2
2008-11-14Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz-3/+7
2008-10-17pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano-2/+2
2008-07-23Ignore dirty submodule states in "git pull --rebase"Johannes Schindelin-3/+3
2008-07-13Make usage strings dash-lessStephan Beyer-1/+1
2008-05-22pull --rebase: exit early when the working directory is dirtyJohannes Schindelin-0/+5
2008-04-12merge, pull: add '--(no-)log' command line optionSZEDER Gábor-3/+5
2008-04-12merge, pull: introduce '--(no-)stat' optionSZEDER Gábor-9/+7
2008-02-22pull: pass --strategy along to to rebaseJay Soffian-1/+2
2008-01-26pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin-1/+11
2007-12-28"git pull --tags": error out with a better message.Junio C Hamano-26/+40
2007-11-28Teach 'git pull' about --rebaseJohannes Schindelin-1/+10
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano-0/+1
2007-10-29Teach git-pull about --[no-]ff, --no-squash and --commitLars Hjemli-3/+11
2007-10-02Make git-pull complain and give advice when there is nothing to merge withFederico Mena Quintero-4/+18
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup-3/+3
2007-07-02Rewrite "git-frotz" to "git frotz"Junio C Hamano-8/+8
2007-05-24Add a configuration option to control diffstat after mergeAlex Riesen-0/+3
2007-01-15git-pull: disallow implicit merging to detached HEADJeff King-2/+11
2007-01-12Allow whole-tree operations to be started from a subdirectoryJunio C Hamano-1/+3
2007-01-10Disallow working directory commands in a bare repository.Shawn O. Pearce-0/+1
2007-01-01fail pull/merge early in the middle of conflicted mergeJunio C Hamano-0/+3
2006-12-28Allow git-merge to select the default strategy.Shawn O. Pearce-18/+0
2006-12-28Ensure `git-pull` fails if `git-merge` fails.Shawn O. Pearce-1/+1
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce-3/+3
2006-12-19Move "no merge candidate" warning into git-pullJosef Weidendorfer-0/+4
2006-11-16git-pull: allow pulling into an empty repositoryLinus Torvalds-2/+14
2006-10-10git-pull: we say commit X, not X commit.Junio C Hamano-1/+1
2006-07-11Log ref changes made by git-merge and git-pull.Shawn Pearce-1/+2
2006-07-10Log ref changes made by git-fetch and git-pull.Shawn Pearce-1/+1
2006-06-27Fix expr usage for FreeBSDDennis Stosberg-1/+1
2006-06-24git-merge --squashJunio C Hamano-2/+5
2006-06-24git-pull: abort when fmt-merge-msg fails.Junio C Hamano-1/+1
2006-03-22git-pull: reword "impossible to fast-forward" message.Junio C Hamano-1/+7
2006-03-22git-pull: further safety while on tracking branch.Junio C Hamano-1/+3
2006-03-18git-pull: run repo-config with dash form.Junio C Hamano-2/+2
2006-03-15Let merge set the default strategy.Mark Hollomon-7/+3
2006-02-12Avoid using "git-var -l" until it gets fixed.Junio C Hamano-4/+4
2005-12-14Trivial usage string clean-upfreku045@student.liu.se-11/+2
2005-11-25git-sh-setup: die if outside git repository.Junio C Hamano-1/+1
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-27 00:21:48 +0000