tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2010-05-08	Merge branch 'cw/ws-indent-with-tab'	Junio C Hamano	1	-42/+39
2010-05-08	Merge branch 'cc/revert-strategy'	Junio C Hamano	2	-110/+150
2010-05-08	Merge branch 'jk/cached-textconv'	Junio C Hamano	1	-69/+1
2010-05-08	Merge branch 'pc/remove-warn'	Junio C Hamano	1	-5/+1
2010-05-08	cherry-pick: do not dump core when iconv fails	Jonathan Nieder	1	-2/+7
2010-05-04	clone: quell the progress report from init and report on clone	Junio C Hamano	1	-1/+5
2010-05-01	Merge branch 'maint'	Junio C Hamano	1	-1/+1
2010-04-19	Merge branch 'maint'	Junio C Hamano	1	-1/+1
2010-04-18	Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'	Junio C Hamano	1	-1/+5
2010-04-17	tag -v: use RUN_GIT_CMD to run verify-tag	Jonathan Nieder	1	-2/+2
2010-04-13	pretty: Initialize notes if %N is used	Johannes Gilger	1	-1/+5
2010-04-09	Merge branch 'maint'	Junio C Hamano	3	-9/+6
2010-04-07	Merge branch 'jn/mailinfo-scissors'	Junio C Hamano	1	-1/+2
2010-04-06	Merge branch 'sb/fmt-merge-msg'	Junio C Hamano	1	-103/+56
2010-04-06	Merge branch 'ef/maint-empty-commit-log'	Junio C Hamano	1	-1/+4
2010-04-04	whitespace: replumb ws_fix_copy to take a strbuf dst instead of char dst	Chris Webb	1	-42/+39
2010-04-04	Teach mailinfo %< as an alternative scissors mark	Jonathan Nieder	1	-1/+2
2010-04-03	Merge branch 'mg/use-default-abbrev-length-in-rev-list'	Junio C Hamano	1	-1/+1
2010-04-03	Merge branch 'jn/merge-diff3-label'	Junio C Hamano	3	-42/+70
2010-04-03	Merge branch 'ef/cherry-abbrev'	Junio C Hamano	3	-27/+25
2010-04-03	Merge branch 'rs/threaded-grep-context'	Junio C Hamano	1	-2/+13
2010-04-02	builtin/commit: remove unnecessary variable definition	Markus Heidelberg	1	-1/+1
2010-04-02	builtin/commit: fix duplicated sentence in a comment	Markus Heidelberg	1	-2/+2
2010-04-01	make commit_tree a library function	Jeff King	1	-69/+1
2010-04-01	revert: add "--strategy" option to choose merge strategy	Christian Couder	1	-2/+23
2010-04-01	merge: make function try_merge_command non static	Christian Couder	1	-2/+2
2010-04-01	merge: refactor code that calls "git merge-STRATEGY"	Christian Couder	1	-36/+45
2010-04-01	revert: refactor merge recursive code into its own function	Christian Couder	1	-48/+58
2010-04-01	revert: use strbuf to refactor the code that writes the merge message	Christian Couder	1	-36/+34
2010-03-31	Sync with 1.7.0.4	Junio C Hamano	1	-1/+2
2010-03-29	Merge branch 'maint'	Junio C Hamano	1	-1/+8
2010-03-28	Merge branch 'cc/cherry-pick-ff'	Junio C Hamano	2	-5/+43
2010-03-28	Merge branch 'sb/notes-parse-opt'	Junio C Hamano	1	-159/+371
2010-03-28	Merge branch 'maint'	Junio C Hamano	1	-1/+1
2010-03-28	Introduce remove_or_warn function	Peter Collingbourne	1	-5/+1
2010-03-24	fmt-merge-msg: hide summary option	Stephen Boyd	1	-1/+3
2010-03-24	fmt-merge-msg: remove custom string_list implementation	Stephen Boyd	1	-83/+44
2010-03-24	fmt-merge-msg: use pretty.c routines	Stephen Boyd	1	-21/+8
2010-03-24	fmt-merge-msg: be quiet if nothing to merge	Stephen Boyd	1	-0/+3
2010-03-24	Merge branch 'tr/notes-display'	Junio C Hamano	3	-1/+246
2010-03-24	Merge branch 'pb/log-first-parent-p-m'	Junio C Hamano	2	-15/+52
2010-03-21	ls: remove redundant logic	Erik Faye-Lund	2	-9/+4
2010-03-21	cherry: support --abbrev option	Erik Faye-Lund	1	-18/+21
2010-03-20	cherry-pick, revert: add a label for ancestor	Jonathan Nieder	1	-1/+4
2010-03-20	revert: clarify label on conflict hunks	Jonathan Nieder	1	-39/+62
2010-03-20	checkout -m --conflict=diff3: add a label for ancestor	Jonathan Nieder	1	-0/+1
2010-03-20	checkout --conflict=diff3: add a label for ancestor	Jonathan Nieder	1	-1/+1
2010-03-20	ll_merge(): add ancestor label parameter for diff3-style output	Jonathan Nieder	1	-1/+1
2010-03-20	merge-file --diff3: add a label for ancestor	Jonathan Nieder	1	-0/+1
2010-03-20	xdl_merge(): move file1 and file2 labels to xmparam structure	Jonathan Nieder	1	-2/+3