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

	Commit message (Expand)	Author	Age
*	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
* \|	Teach --[no-]rerere-autoupdate option to merge, revert and friends	Junio C Hamano	2009-12-04
\|/
*	Use die_errno() instead of die() when checking syscalls	Thomas Rast	2009-06-27
*	Merge branch 'sb/opt-filename'	Junio C Hamano	2009-05-31
\|\
\| *	parse-opts: prepare for OPT_FILENAME	Stephen Boyd	2009-05-25
* \|	Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility	Brandon Casey	2009-05-18
\|/
*	Merge branch 'maint-1.6.1' into maint	Junio C Hamano	2009-03-07
\|\
\| *	builtin-revert.c: release index lock when cherry-picking an empty commit	Chris Johnsen	2009-03-07
* \|	Generalize and libify index_is_dirty() to index_differs_from(...)	Stephan Beyer	2009-02-10
\|/
*	git-revert: record the parent against which a revert was made	Robin Rosenberg	2008-12-21
*	Merge branch 'ar/mksnpath'	Junio C Hamano	2008-11-05
\|\
\| *	Merge branch 'ar/maint-mksnpath' into ar/mksnpath	Junio C Hamano	2008-10-30
\| \|\
\| \| *	Use git_pathdup instead of xstrdup(git_path(...))	Alex Riesen	2008-10-30
* \| \|	Merge branch 'maint'	Junio C Hamano	2008-10-31
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Plug a memleak in builtin-revert	Alex Riesen	2008-10-30
\| \|/
* \|	Merge branch 'jc/maint-co-track'	Junio C Hamano	2008-10-21
\|\ \
\| * \|	Enhance hold_lock_file_for_{update,append}() API	Junio C Hamano	2008-10-19
\| \|/
* \|	cherry-pick/revert: make direct internal call to merge_tree()	Miklos Vajna	2008-09-02
* \|	Make cherry-pick use rerere for conflict resolution.	Abhijit Menon-Sen	2008-08-11
\|/
*	Merge branch 'maint'	Junio C Hamano	2008-08-01
\|\
\| *	builtin-revert.c: typofix	Stephan Beyer	2008-08-01
* \|	Merge branch 'sb/dashless'	Junio C Hamano	2008-07-16
\|\ \
\| * \|	Make usage strings dash-less	Stephan Beyer	2008-07-13
\| \|/
* \|	Allow cherry-picking root commits	Johannes Schindelin	2008-07-07
\|/
*	Provide git_config with a callback-data parameter	Johannes Schindelin	2008-05-14
*	Allow cherry-pick (and revert) to add signoff line	Dan McGee	2008-04-26
*	Merge branch 'maint'	Junio C Hamano	2008-03-02
\|\
\| *	revert: actually check for a dirty index	Jeff King	2008-03-02
* \|	Avoid unnecessary "if-before-free" tests.	Jim Meyering	2008-02-22
* \|	Make error messages from cherry-pick/revert more sensible	Junio C Hamano	2008-02-05
\|/
*	Improve use of lockfile API	Brandon Casey	2008-01-16
*	Mention that git-rm can be an appropriate resolution as well as git-add.	David Symonds	2007-11-30
*	revert/cherry-pick: Allow overriding the help text by the calling Porcelain	Wincent Colaiuta	2007-11-30
*	revert/cherry-pick: do not mention the original ref	Junio C Hamano	2007-11-25
*	Merge branch 'maint'	Junio C Hamano	2007-11-14
\|\
\| *	revert/cherry-pick: allow starting from dirty work tree.	Junio C Hamano	2007-11-13
* \|	Resurrect git-revert.sh example and add comment to builtin-revert.c	Junio C Hamano	2007-11-13
* \|	Merge branch 'jc/revert-merge'	Junio C Hamano	2007-11-04
\|\ \
\| * \|	revert/cherry-pick: work on merge commits as well	Junio C Hamano	2007-10-26
* \| \|	Merge branch 'ph/parseopt'	Junio C Hamano	2007-11-02
\|\ \ \
\| * \| \|	Make builtin-revert.c use parse_options.	Pierre Habouzit	2007-10-29
\| \|/ /
* \| \|	Merge branch 'maint' into HEAD	Junio C Hamano	2007-10-30
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	cherry-pick/revert: more compact user direction message	Nicolas Pitre	2007-10-30
* \|	Use xmemdupz() in many places.	Pierre Habouzit	2007-09-18
\|/
*	More static	Junio C Hamano	2007-06-13
*	Missing statics.	Pierre Habouzit	2007-06-08
*	Fix command line parameter parser of revert/cherry-pick	Junio C Hamano	2007-05-23
*	Correct error message in revert/cherry-pick	Shawn O. Pearce	2007-05-10
*	Use .git/MERGE_MSG in cherry-pick/revert	Shawn O. Pearce	2007-05-08