tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2007-12-28	"git pull --tags": error out with a better message.	Junio C Hamano	1	-26/+40
2007-11-28	Teach 'git pull' about --rebase	Johannes Schindelin	1	-1/+10
2007-11-06	scripts: Add placeholders for OPTIONS_SPEC	Junio C Hamano	1	-0/+1
2007-10-29	Teach git-pull about --[no-]ff, --no-squash and --commit	Lars Hjemli	1	-3/+11
2007-10-02	Make git-pull complain and give advice when there is nothing to merge with	Federico Mena Quintero	1	-4/+18
2007-09-23	Supplant the "while case ... break ;; esac" idiom	David Kastrup	1	-3/+3
2007-07-02	Rewrite "git-frotz" to "git frotz"	Junio C Hamano	1	-8/+8
2007-05-24	Add a configuration option to control diffstat after merge	Alex Riesen	1	-0/+3
2007-01-15	git-pull: disallow implicit merging to detached HEAD	Jeff King	1	-2/+11
2007-01-12	Allow whole-tree operations to be started from a subdirectory	Junio C Hamano	1	-1/+3
2007-01-10	Disallow working directory commands in a bare repository.	Shawn O. Pearce	1	-0/+1
2007-01-01	fail pull/merge early in the middle of conflicted merge	Junio C Hamano	1	-0/+3
2006-12-28	Allow git-merge to select the default strategy.	Shawn O. Pearce	1	-18/+0
2006-12-28	Ensure `git-pull` fails if `git-merge` fails.	Shawn O. Pearce	1	-1/+1
2006-12-28	Use GIT_REFLOG_ACTION environment variable instead.	Shawn O. Pearce	1	-3/+3
2006-12-19	Move "no merge candidate" warning into git-pull	Josef Weidendorfer	1	-0/+4
2006-11-16	git-pull: allow pulling into an empty repository	Linus Torvalds	1	-2/+14
2006-10-10	git-pull: we say commit X, not X commit.	Junio C Hamano	1	-1/+1
2006-07-11	Log ref changes made by git-merge and git-pull.	Shawn Pearce	1	-1/+2
2006-07-10	Log ref changes made by git-fetch and git-pull.	Shawn Pearce	1	-1/+1
2006-06-27	Fix expr usage for FreeBSD	Dennis Stosberg	1	-1/+1
2006-06-24	git-merge --squash	Junio C Hamano	1	-2/+5
2006-06-24	git-pull: abort when fmt-merge-msg fails.	Junio C Hamano	1	-1/+1
2006-03-22	git-pull: reword "impossible to fast-forward" message.	Junio C Hamano	1	-1/+7
2006-03-22	git-pull: further safety while on tracking branch.	Junio C Hamano	1	-1/+3
2006-03-18	git-pull: run repo-config with dash form.	Junio C Hamano	1	-2/+2
2006-03-15	Let merge set the default strategy.	Mark Hollomon	1	-7/+3
2006-02-12	Avoid using "git-var -l" until it gets fixed.	Junio C Hamano	1	-4/+4
2005-12-14	Trivial usage string clean-up	freku045@student.liu.se	1	-11/+2
2005-11-25	git-sh-setup: die if outside git repository.	Junio C Hamano	1	-1/+1
2005-11-09	Make git-recursive the default strategy for git-pull.	Junio C Hamano	1	-2/+14
2005-11-07	Recover dropped +x bit from git-pull.sh by accident.	Junio C Hamano	1	-0/+0
2005-11-06	Refactored merge options into separate merge-options.txt.	Jon Loeliger	1	-1/+11
2005-11-04	Document the --no-commit flag better	Junio C Hamano	1	-1/+1
2005-11-03	Add --no-commit to git-merge/git-pull.	Junio C Hamano	1	-2/+4
2005-10-03	git-pull: do not barf on -a flag meant for git-fetch.	Junio C Hamano	1	-1/+2
2005-09-29	Use git-merge in git-pull (second try).	Junio C Hamano	1	-4/+44
2005-09-28	Use git-update-ref in scripts.	Junio C Hamano	1	-3/+3
2005-09-28	Fix default pull not to do an unintended Octopus.	Junio C Hamano	1	-1/+3
2005-09-22	Prettyprint octopus merge message.	Junio C Hamano	1	-7/+2
2005-09-21	Revert "Use git-merge instead of git-resolve in git-pull."	Junio C Hamano	1	-33/+7
2005-09-21	Revert "Make Octopus merge message a bit nicer."	Junio C Hamano	1	-76/+5
2005-09-20	Make Octopus merge message a bit nicer.	Junio C Hamano	1	-5/+76
2005-09-20	Use git-merge instead of git-resolve in git-pull.	Junio C Hamano	1	-7/+33
2005-09-15	Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.	Junio C Hamano	1	-1/+1
2005-09-13	Make merge comment git-pull makes for an octopus a bit prettier.	Junio C Hamano	1	-3/+5
2005-09-07	Big tool rename.	Junio C Hamano	1	-0/+44