summaryrefslogtreecommitdiff
path: root/git-pull.sh
AgeCommit message (Expand)AuthorFilesLines
2009-04-08Merge branch 'maint'Libravatar Junio C Hamano1-17/+25
2009-04-08git-pull.sh: better warning message for "git pull" on detached head.Libravatar Matthieu Moy1-17/+25
2009-03-02git-pull: Allow --stat and --no-stat to be used with --rebaseLibravatar Tor Arne Vestbø1-5/+5
2009-02-18disallow providing multiple upstream branches to rebase, pull --rebaseLibravatar Jay Soffian1-0/+5
2008-12-03pull: use git rev-parse -qLibravatar Miklos Vajna1-4/+4
2008-11-18Retain multiple -q/-v occurrences in git pullLibravatar Tuncer Ayaz1-2/+2
2008-11-14Teach/Fix pull/fetch -q/-v optionsLibravatar Tuncer Ayaz1-3/+7
2008-10-17pull: allow "git pull origin $something:$current_branch" into an unborn branchLibravatar Junio C Hamano1-2/+2
2008-07-23Ignore dirty submodule states in "git pull --rebase"Libravatar Johannes Schindelin1-3/+3
2008-07-13Make usage strings dash-lessLibravatar Stephan Beyer1-1/+1
2008-05-22pull --rebase: exit early when the working directory is dirtyLibravatar Johannes Schindelin1-0/+5
2008-04-12merge, pull: add '--(no-)log' command line optionLibravatar SZEDER Gábor1-3/+5
2008-04-12merge, pull: introduce '--(no-)stat' optionLibravatar SZEDER Gábor1-9/+7
2008-02-22pull: pass --strategy along to to rebaseLibravatar Jay Soffian1-1/+2
2008-01-26pull --rebase: be cleverer with rebased upstream branchesLibravatar Johannes Schindelin1-1/+11
2007-12-28"git pull --tags": error out with a better message.Libravatar Junio C Hamano1-26/+40
2007-11-28Teach 'git pull' about --rebaseLibravatar Johannes Schindelin1-1/+10
2007-11-06scripts: Add placeholders for OPTIONS_SPECLibravatar Junio C Hamano1-0/+1
2007-10-29Teach git-pull about --[no-]ff, --no-squash and --commitLibravatar Lars Hjemli1-3/+11
2007-10-02Make git-pull complain and give advice when there is nothing to merge withLibravatar Federico Mena Quintero1-4/+18
2007-09-23Supplant the "while case ... break ;; esac" idiomLibravatar David Kastrup1-3/+3
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-8/+8
2007-05-24Add a configuration option to control diffstat after mergeLibravatar Alex Riesen1-0/+3
2007-01-15git-pull: disallow implicit merging to detached HEADLibravatar Jeff King1-2/+11
2007-01-12Allow whole-tree operations to be started from a subdirectoryLibravatar Junio C Hamano1-1/+3
2007-01-10Disallow working directory commands in a bare repository.Libravatar Shawn O. Pearce1-0/+1
2007-01-01fail pull/merge early in the middle of conflicted mergeLibravatar Junio C Hamano1-0/+3
2006-12-28Allow git-merge to select the default strategy.Libravatar Shawn O. Pearce1-18/+0
2006-12-28Ensure `git-pull` fails if `git-merge` fails.Libravatar Shawn O. Pearce1-1/+1
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Libravatar Shawn O. Pearce1-3/+3
2006-12-19Move "no merge candidate" warning into git-pullLibravatar Josef Weidendorfer1-0/+4
2006-11-16git-pull: allow pulling into an empty repositoryLibravatar Linus Torvalds1-2/+14
2006-10-10git-pull: we say commit X, not X commit.Libravatar Junio C Hamano1-1/+1
2006-07-11Log ref changes made by git-merge and git-pull.Libravatar Shawn Pearce1-1/+2
2006-07-10Log ref changes made by git-fetch and git-pull.Libravatar Shawn Pearce1-1/+1
2006-06-27Fix expr usage for FreeBSDLibravatar Dennis Stosberg1-1/+1
2006-06-24git-merge --squashLibravatar Junio C Hamano1-2/+5
2006-06-24git-pull: abort when fmt-merge-msg fails.Libravatar Junio C Hamano1-1/+1
2006-03-22git-pull: reword "impossible to fast-forward" message.Libravatar Junio C Hamano1-1/+7
2006-03-22git-pull: further safety while on tracking branch.Libravatar Junio C Hamano1-1/+3
2006-03-18git-pull: run repo-config with dash form.Libravatar Junio C Hamano1-2/+2
2006-03-15Let merge set the default strategy.Libravatar Mark Hollomon1-7/+3
2006-02-12Avoid using "git-var -l" until it gets fixed.Libravatar Junio C Hamano1-4/+4
2005-12-14Trivial usage string clean-upLibravatar freku045@student.liu.se1-11/+2
2005-11-25git-sh-setup: die if outside git repository.Libravatar Junio C Hamano1-1/+1
2005-11-09Make git-recursive the default strategy for git-pull.Libravatar Junio C Hamano1-2/+14
2005-11-07Recover dropped +x bit from git-pull.sh by accident.Libravatar Junio C Hamano1-0/+0
2005-11-06Refactored merge options into separate merge-options.txt.Libravatar Jon Loeliger1-1/+11
2005-11-04Document the --no-commit flag betterLibravatar Junio C Hamano1-1/+1
2005-11-03Add --no-commit to git-merge/git-pull.Libravatar Junio C Hamano1-2/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 03:38:09 +0000