aboutsummaryrefslogtreecommitdiff
path: root/git-pull.sh
Commit message (Expand)AuthorAge
* 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
* Move "no merge candidate" warning into git-pullJosef Weidendorfer2006-12-19
* git-pull: allow pulling into an empty repositoryLinus Torvalds2006-11-16
* git-pull: we say commit X, not X commit.Junio C Hamano2006-10-10
* Log ref changes made by git-merge and git-pull.Shawn Pearce2006-07-11
* Log ref changes made by git-fetch and git-pull.Shawn Pearce2006-07-10
* Fix expr usage for FreeBSDDennis Stosberg2006-06-27
* git-merge --squashJunio C Hamano2006-06-24
* git-pull: abort when fmt-merge-msg fails.Junio C Hamano2006-06-24
* git-pull: reword "impossible to fast-forward" message.Junio C Hamano2006-03-22
* git-pull: further safety while on tracking branch.Junio C Hamano2006-03-22
* git-pull: run repo-config with dash form.Junio C Hamano2006-03-18
* Let merge set the default strategy.Mark Hollomon2006-03-15
* Avoid using "git-var -l" until it gets fixed.Junio C Hamano2006-02-12
* Trivial usage string clean-upfreku045@student.liu.se2005-12-14
* git-sh-setup: die if outside git repository.Junio C Hamano2005-11-25
* Make git-recursive the default strategy for git-pull.Junio C Hamano2005-11-09
* Recover dropped +x bit from git-pull.sh by accident.Junio C Hamano2005-11-07
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-06
* Document the --no-commit flag betterJunio C Hamano2005-11-04
* Add --no-commit to git-merge/git-pull.Junio C Hamano2005-11-03
* git-pull: do not barf on -a flag meant for git-fetch.Junio C Hamano2005-10-03
* Use git-merge in git-pull (second try).Junio C Hamano2005-09-29
* Use git-update-ref in scripts.Junio C Hamano2005-09-28
* Fix default pull not to do an unintended Octopus.Junio C Hamano2005-09-28
* Prettyprint octopus merge message.Junio C Hamano2005-09-22
* Revert "Use git-merge instead of git-resolve in git-pull."Junio C Hamano2005-09-21
* Revert "Make Octopus merge message a bit nicer."Junio C Hamano2005-09-21
* Make Octopus merge message a bit nicer.Junio C Hamano2005-09-20
* Use git-merge instead of git-resolve in git-pull.Junio C Hamano2005-09-20
* Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.Junio C Hamano2005-09-15
* Make merge comment git-pull makes for an octopus a bit prettier.Junio C Hamano2005-09-13
* Big tool rename.Junio C Hamano2005-09-07
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-09 01:56:29 +0000