summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2008-12-17make_absolute_path(): check bounds when seeing an overlong symlinkLibravatar Junio C Hamano1-0/+2
2008-12-17Make 'prepare_temp_file()' ignore st_size for symlinksLibravatar Linus Torvalds1-5/+4
2008-12-17Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Libravatar Linus Torvalds1-9/+7
2008-12-17Make 'index_path()' use 'strbuf_readlink()'Libravatar Linus Torvalds1-9/+5
2008-12-17Make 'ce_compare_link()' use the new 'strbuf_readlink()'Libravatar Linus Torvalds1-14/+8
2008-12-17Add generic 'strbuf_readlink()' helper functionLibravatar Linus Torvalds3-4/+30
2008-12-17git-gui: Get rid of the last remnants of GIT_CONFIG_LOCALLibravatar Johannes Schindelin1-1/+0
2008-12-17doc/git-reset: add reference to git-stashLibravatar Markus Heidelberg1-0/+2
2008-12-17Documentation: fix description for enabling hooksLibravatar Markus Heidelberg2-2/+4
2008-12-17git-daemon documentation: use {tilde}Libravatar Miklos Vajna1-2/+2
2008-12-16gitweb: do not run "git diff" that is PorcelainLibravatar Junio C Hamano1-37/+3
2008-12-16GIT 1.5.6.6Libravatar Junio C Hamano5-37/+33
2008-12-16GIT 1.5.5.6Libravatar Junio C Hamano4-37/+23
2008-12-16GIT 1.5.4.7Libravatar Junio C Hamano2-1/+11
2008-12-16gitweb: do not run "git diff" that is PorcelainLibravatar Junio C Hamano1-36/+2
2008-12-15bash completion: Sync config variables with their man pagesLibravatar Lee Marlow1-7/+80
2008-12-15bash completion: Sort config completion variablesLibravatar Lee Marlow1-37/+40
2008-12-15Merge branch 'maint'Libravatar Junio C Hamano4-3/+32
2008-12-15fast-import: close pack before unlinking itLibravatar Johannes Schindelin1-1/+3
2008-12-15Force t5302 to use a single threadLibravatar Johannes Schindelin1-0/+1
2008-12-15pager: do not dup2 stderr if it is already redirectedLibravatar Junio C Hamano1-1/+2
2008-12-15git-show: do not segfault when showing a bad tagLibravatar Junio C Hamano2-1/+27
2008-12-14Get rid of the last remnants of GIT_CONFIG_LOCALLibravatar Johannes Schindelin4-8/+3
2008-12-14Documentation: Describe git-gui Tools menu configuration options.Libravatar Alexander Gavrilov1-0/+51
2008-12-14git-fast-import possible memory corruption problemLibravatar YONETANI Tomokazu1-3/+4
2008-12-13pack-objects: don't use too many threads with few objectsLibravatar Nicolas Pitre1-0/+4
2008-12-13builtin-commit: remove unused message variableLibravatar Markus Heidelberg1-5/+0
2008-12-12Merge branch 'maint'Libravatar Junio C Hamano1-1/+1