summaryrefslogtreecommitdiff
path: root/git-pull.sh
AgeCommit message (Expand)AuthorFilesLines
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
2005-10-03git-pull: do not barf on -a flag meant for git-fetch.Libravatar Junio C Hamano1-1/+2
2005-09-29Use git-merge in git-pull (second try).Libravatar Junio C Hamano1-4/+44
2005-09-28Use git-update-ref in scripts.Libravatar Junio C Hamano1-3/+3
2005-09-28Fix default pull not to do an unintended Octopus.Libravatar Junio C Hamano1-1/+3
2005-09-22Prettyprint octopus merge message.Libravatar Junio C Hamano1-7/+2
2005-09-21Revert "Use git-merge instead of git-resolve in git-pull."Libravatar Junio C Hamano1-33/+7
2005-09-21Revert "Make Octopus merge message a bit nicer."Libravatar Junio C Hamano1-76/+5
2005-09-20Make Octopus merge message a bit nicer.Libravatar Junio C Hamano1-5/+76
2005-09-20Use git-merge instead of git-resolve in git-pull.Libravatar Junio C Hamano1-7/+33
2005-09-15Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.Libravatar Junio C Hamano1-1/+1
2005-09-13Make merge comment git-pull makes for an octopus a bit prettier.Libravatar Junio C Hamano1-3/+5
2005-09-07Big tool rename.Libravatar Junio C Hamano1-0/+44
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 20:23:06 +0000