summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-12-24merge-recursive: mark rename/delete conflict as unmergedLibravatar Johannes Schindelin2-0/+28
2008-12-24GIT 1.6.1Libravatar Junio C Hamano2-0/+9
2008-12-24Merge branch 'js/rebase-i-p'Libravatar Junio C Hamano2-16/+58
2008-12-24rebase -i -p: leave a --cc patch when a merge could not be redoneLibravatar Johannes Schindelin2-3/+13
2008-12-22t9129: skip the last three tests if UTF-8 locale is not availableLibravatar Miklos Vajna1-13/+17
2008-12-21GIT 1.6.1-rc4Libravatar Junio C Hamano1-1/+18
2008-12-21Always show which directory is not a git repositoryLibravatar Richard Hartmann3-4/+4
2008-12-21Make help entries alphabeticalLibravatar Richard Hartmann1-4/+4
2008-12-21Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2008-12-21git-revert documentation: refer to new HOWTO on reverting faulty mergesLibravatar Boyd Stephen Smith Jr1-0/+8
2008-12-21git-revert: record the parent against which a revert was madeLibravatar Robin Rosenberg1-0/+5
2008-12-21Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano2-63/+213
2008-12-22gitk: Force the focus to the main window on WindowsLibravatar Johannes Sixt1-0/+5
2008-12-22gitk: Allow unbalanced quotes/braces in commit headersLibravatar Kevin Ballard1-2/+3
2008-12-22gitk: Update German translationLibravatar Christian Stimming1-29/+157
2008-12-22gitk: Mark forgotten strings (header sentence parts in color chooser) for tra...Libravatar Christian Stimming1-6/+6
2008-12-22gitk: Ensure that "Reset branch" menu entry is enabledLibravatar Johannes Sixt1-1/+1
2008-12-22gitk: Use check-buttons' -text property instead of separate labelsLibravatar Johannes Sixt1-20/+10
2008-12-22gitk: Map / to focus the search boxLibravatar Giuseppe Bilotta1-2/+2
2008-12-21doc/git-fsck: change the way for getting heads' SHA1sLibravatar Markus Heidelberg1-1/+2
2008-12-21Documentation/git-show-branch: work around "single quote" typesetting glitchLibravatar Markus Heidelberg1-1/+1
2008-12-21send-email: futureproof split_addrs() subLibravatar Junio C Hamano1-1/+1
2008-12-21Make sure lockfiles are unlocked when dying on SIGPIPELibravatar Junio C Hamano2-0/+18
2008-12-21fast-import.c: stricter strtoul check, silence compiler warningLibravatar René Scharfe1-4/+7
2008-12-21connect.c: stricter port validation, silence compiler warningLibravatar René Scharfe1-2/+2
2008-12-21Add a documentat on how to revert a faulty mergeLibravatar Nanako Shiraishi1-0/+179
2008-12-21Remove the requirement opaquelocktoken uri schemeLibravatar Kirill A. Korinskiy1-8/+6
2008-12-21git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dirLibravatar Marcel M. Cary3-2/+136
2008-12-21rebase -i -p: Fix --continue after a merge could not be redoneLibravatar Johannes Sixt2-3/+2
2008-12-21Show a failure of rebase -p if the merge had a conflictLibravatar Johannes Sixt1-11/+44
2008-12-19Documentation: fix typos, grammar, asciidoc syntaxLibravatar Markus Heidelberg1-1/+1
2008-12-19Merge branch 'maint' to sync with GIT 1.6.0.6Libravatar Junio C Hamano26-48/+185
2008-12-19GIT 1.6.0.6Libravatar Junio C Hamano6-38/+67
2008-12-19fast-import: make tagger information optionalLibravatar Junio C Hamano2-11/+33
2008-12-19fast-export: deal with tag objects that do not have a taggerLibravatar Johannes Schindelin3-5/+42
2008-12-19SubmittingPatches: mention the usage of real name in Signed-off-by: linesLibravatar Miklos Vajna1-0/+3
2008-12-19git-mergetool: properly handle "git mergetool -- filename"Libravatar David Aguilar1-0/+1
2008-12-19git-send-email: handle email address with quoted commaLibravatar Wu Fengguang1-3/+8
2008-12-19Documentation: fix typos, grammar, asciidoc syntaxLibravatar Markus Heidelberg13-25/+25
2008-12-19Documentation: sync example output with git outputLibravatar Markus Heidelberg4-11/+9
2008-12-18Fix type-mismatch compiler warning from diff_populate_filespec()Libravatar René Scharfe1-1/+2
2008-12-18test overlapping ignore patternsLibravatar Michael J Gruber1-0/+6
2008-12-17Merge branch 'lt/readlink'Libravatar Junio C Hamano9-50/+62
2008-12-17Enable threaded delta search on Mac OS X/DarwinLibravatar Arjen Laarhoven1-0/+1
2008-12-17Clarify documentation of "git checkout <tree-ish> paths" syntaxLibravatar Nanako Shiraishi1-1/+1
2008-12-17Merge git://repo.or.cz/git-guiLibravatar Junio C Hamano11-423/+3157
2008-12-17git-gui 0.12Libravatar Shawn O. Pearce1-1/+1
2008-12-17githooks documentation: add a note about the +x modeLibravatar Miklos Vajna1-0/+4
2008-12-17combine-diff.c: use strbuf_readlink()Libravatar Junio C Hamano1-5/+5
2008-12-17builtin-blame.c: use strbuf_readlink()Libravatar Junio C Hamano1-4/+1