org/kernel/git.git - forked from git/git

	Commit message (Expand)	Author	Age
*	git-rebase.txt: Fix spelling	Horst H. von Brand	2010-01-21
*	conflict-marker-size: add test and docs	Junio C Hamano	2010-01-20
*	Update draft release notes to 1.7.0	Junio C Hamano	2010-01-20
*	Merge branch 'ap/merge-backend-opts'	Junio C Hamano	2010-01-20
\|\
\| *	Document that merge strategies can now take their own options	Junio C Hamano	2010-01-17
\| *	git-merge-file --ours, --theirs	Junio C Hamano	2009-11-29
* \|	Merge remote branch 'remotes/trast-doc/for-next'	Junio C Hamano	2010-01-20
\|\ \
\| * \|	Documentation: spell 'git cmd' without dash throughout	Thomas Rast	2010-01-10
\| * \|	Documentation: format full commands in typewriter font	Thomas Rast	2010-01-10
\| * \|	Documentation: warn prominently against merging with dirty trees	Thomas Rast	2010-01-09
\| * \|	Documentation/git-merge: reword references to "remote" and "pull"	Thomas Rast	2010-01-09
* \| \|	Merge branch 'rr/core-tutorial'	Junio C Hamano	2010-01-20
\|\ \ \
\| * \| \|	Documentation: Update git core tutorial clarifying reference to scripts	Ramkumar Ramachandra	2010-01-16
* \| \| \|	Merge branch 'jc/grep-lookahead'	Junio C Hamano	2010-01-20
\|\ \ \ \
\| * \| \| \|	grep: rip out support for external grep	Junio C Hamano	2010-01-13
\| \|/ / /
* \| \| \|	Merge branch 'mm/conflict-advice'	Junio C Hamano	2010-01-20
\|\ \ \ \
\| * \| \| \|	Be more user-friendly when refusing to do something because of conflict.	Matthieu Moy	2010-01-12
\| \|/ / /
* \| \| \|	Merge branch 'da/difftool'	Junio C Hamano	2010-01-20
\|\ \ \ \
\| * \| \| \|	difftool: Add '-x' and as an alias for '--extcmd'	David Aguilar	2010-01-15
\| * \| \| \|	git-diff.txt: Link to git-difftool	David Aguilar	2010-01-09
\| * \| \| \|	difftool: Allow specifying unconfigured commands with --extcmd	David Aguilar	2010-01-09
\| * \| \| \|	git-difftool: Add '--gui' for selecting a GUI tool	David Aguilar	2010-01-03
\| \|/ / /
* \| \| \|	Merge branch 'ns/rebase-auto-squash'	Junio C Hamano	2010-01-20
\|\ \ \ \
\| * \| \| \|	rebase -i --autosquash: auto-squash commits	Nanako Shiraishi	2010-01-06
* \| \| \| \|	Merge branch 'mh/rebase-fixup' (early part)	Junio C Hamano	2010-01-20
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Add a command "fixup" to rebase --interactive	Michael Haggerty	2009-12-07
* \| \| \| \|	Merge branch 'il/push-set-upstream'	Junio C Hamano	2010-01-20
\|\ \ \ \ \
\| * \| \| \| \|	Add push --set-upstream	Ilari Liusvaara	2010-01-16
* \| \| \| \| \|	Merge branch 'jk/warn-author-committer-after-commit'	Junio C Hamano	2010-01-20
\|\ \ \ \ \ \
\| * \| \| \| \| \|	commit: allow suppression of implicit identity advice	Jeff King	2010-01-14
\| * \| \| \| \| \|	strbuf: add strbuf_addbuf_percentquote	Jeff King	2010-01-14
\| * \| \| \| \| \|	strbuf_expand: convert "%%" to "%"	Jeff King	2010-01-14
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'sd/cd-p-show-toplevel'	Junio C Hamano	2010-01-20
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add 'git rev-parse --show-toplevel' option.	Steven Drake	2010-01-11
\| \|/ / / / /
* \| \| \| \| \|	Sync with 1.6.6.1	Junio C Hamano	2010-01-20
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Git 1.6.6.1v1.6.6.1	Junio C Hamano	2010-01-20
\| * \| \| \| \| \|	Merge branch 'bg/maint-add-all-doc' into maint	Junio C Hamano	2010-01-20
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'maint-1.6.5' into maint	Junio C Hamano	2010-01-20
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Git 1.6.5.8v1.6.5.8	Junio C Hamano	2010-01-20
* \| \| \| \| \| \| \| \|	Update draft release notes to 1.7.0	Junio C Hamano	2010-01-18
* \| \| \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2010-01-18
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Update draft release notes to 1.6.6.1	Junio C Hamano	2010-01-18
* \| \| \| \| \| \| \| \|	Merge branch 'jc/rerere'	Junio C Hamano	2010-01-18
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Teach --[no-]rerere-autoupdate option to merge, revert and friends	Junio C Hamano	2009-12-04
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Update draft release notes to 1.7.0	Junio C Hamano	2010-01-17
* \| \| \| \| \| \| \| \|	Merge branch 'jh/commit-status'	Junio C Hamano	2010-01-17
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	commit: support commit.status, --status, and --no-status	James P. Howard, II	2010-01-13
* \| \| \| \| \| \| \| \| \|	Merge branch 'jn/makefile'	Junio C Hamano	2010-01-17
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Makefile: consolidate .FORCE-* targets	Jonathan Nieder	2010-01-06
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'tc/clone-v-progress'	Junio C Hamano	2010-01-17
\|\ \ \ \ \ \ \ \ \ \ \