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

	Commit message (Collapse)	Author	Age
*	Documentation: fix misuses of "nor"	Justin Lebar	2014-03-31
\| \| \| \| \|	Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	howto/revert-a-faulty-merge: fix unescaped '^'s	Ramsay Jones	2013-10-14
\| \| \| \| \| \| \| \| \| \|	Several uses of the '^' operator are being interpreted by asciidoc as requests to show the following text as a superscript. In order to fix this problem, use backticks (`) to quote the text of the affected git command invocations. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
*	Documentation: the name of the system is 'Git', not 'git'	Thomas Ackermann	2013-02-01
\| \| \| \| \|	Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Documentation/howto: convert plain text files to asciidoc	Thomas Ackermann	2012-10-18
\| \| \| \| \| \| \| \|	These were not originally meant for asciidoc, but they are already so close. Mark them up in asciidoc. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Typos in code comments, an error message, documentation	Ralf Wildenhues	2010-08-22
\| \| \| \| \|	Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Teach rebase the --no-ff option.	Marc Branchaud	2010-03-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For git-rebase.sh, --no-ff is a synonym for --force-rebase. For git-rebase--interactive.sh, --no-ff cherry-picks all the commits in the rebased branch, instead of fast-forwarding over any unchanged commits. --no-ff offers an alternative way to deal with reverted merges. Instead of "reverting the revert" you can use "rebase --no-ff" to recreate the branch with entirely new commits (they're new because at the very least the committer time is different). This obviates the need to revert the reversion, as you can re-merge the new topic branch directly. Added an addendum to revert-a-faulty-merge.txt describing the situation and how to use --no-ff to handle it. Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Documentation: Typo / spelling / formatting fixes	Mike Ralphson	2009-03-03
\| \| \| \| \|	Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Add a documentat on how to revert a faulty merge	Nanako Shiraishi	2008-12-21
	Linus and Junio explained issues that are involved in reverting a merge and how to continue working with a branch that was updated since such a revert on the mailing list. This is to help new people who did not see these messages. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>