summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin2008-12-242-3/+13
* rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt2008-12-212-3/+2
* Show a failure of rebase -p if the merge had a conflictJohannes Sixt2008-12-211-11/+44
* Documentation: fix typos, grammar, asciidoc syntaxMarkus Heidelberg2008-12-201-1/+1
* Merge branch 'maint' to sync with GIT 1.6.0.6Junio C Hamano2008-12-2026-48/+185
|\
| * GIT 1.6.0.6v1.6.0.6Junio C Hamano2008-12-206-38/+67
| |\
| | * GIT 1.5.6.6v1.5.6.6Junio C Hamano2008-12-175-37/+33
| | |\
| | | * GIT 1.5.5.6v1.5.5.6Junio C Hamano2008-12-174-37/+23
| | | |\
| | | | * GIT 1.5.4.7v1.5.4.7Junio C Hamano2008-12-172-1/+11
| | | | * gitweb: do not run "git diff" that is PorcelainJunio C Hamano2008-12-171-36/+2
| * | | | fast-import: make tagger information optionalJunio C Hamano2008-12-202-11/+33
| * | | | fast-export: deal with tag objects that do not have a taggerJohannes Schindelin2008-12-203-5/+42
| * | | | SubmittingPatches: mention the usage of real name in Signed-off-by: linesMiklos Vajna2008-12-201-0/+3
| * | | | git-mergetool: properly handle "git mergetool -- filename"David Aguilar2008-12-201-0/+1
| * | | | git-send-email: handle email address with quoted commaWu Fengguang2008-12-201-3/+8
| * | | | Documentation: fix typos, grammar, asciidoc syntaxMarkus Heidelberg2008-12-2013-25/+25
* | | | | Documentation: sync example output with git outputMarkus Heidelberg2008-12-194-11/+9
* | | | | Fix type-mismatch compiler warning from diff_populate_filespec()René Scharfe2008-12-181-1/+2
* | | | | test overlapping ignore patternsMichael J Gruber2008-12-181-0/+6
* | | | | Merge branch 'lt/readlink'Junio C Hamano2008-12-189-50/+62
|\ \ \ \ \
| * | | | | combine-diff.c: use strbuf_readlink()Junio C Hamano2008-12-171-5/+5
| * | | | | builtin-blame.c: use strbuf_readlink()Junio C Hamano2008-12-171-4/+1
| * | | | | make_absolute_path(): check bounds when seeing an overlong symlinkJunio C Hamano2008-12-171-0/+2
| * | | | | Make 'prepare_temp_file()' ignore st_size for symlinksLinus Torvalds2008-12-171-5/+4
| * | | | | Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Linus Torvalds2008-12-171-9/+7
| * | | | | Make 'index_path()' use 'strbuf_readlink()'Linus Torvalds2008-12-171-9/+5
| * | | | | Make 'ce_compare_link()' use the new 'strbuf_readlink()'Linus Torvalds2008-12-171-14/+8
| * | | | | Add generic 'strbuf_readlink()' helper functionLinus Torvalds2008-12-173-4/+30
* | | | | | Enable threaded delta search on Mac OS X/DarwinArjen Laarhoven2008-12-181-0/+1
* | | | | | Clarify documentation of "git checkout <tree-ish> paths" syntaxNanako Shiraishi2008-12-181-1/+1
* | | | | | Merge git://repo.or.cz/git-guiJunio C Hamano2008-12-1811-423/+3157
|\ \ \ \ \ \
| * | | | | | git-gui 0.12gitgui-0.12.0Shawn O. Pearce2008-12-181-1/+1
| * | | | | | git-gui: Get rid of the last remnants of GIT_CONFIG_LOCALJohannes Schindelin2008-12-171-1/+0
| * | | | | | git-gui: Update Hungarian translation for 0.12Miklos Vajna2008-12-101-90/+96
| * | | | | | git-gui: Fixed typos in Swedish translation.Peter Krefting2008-12-101-3/+3
| * | | | | | git-gui: Updated Swedish translation (515t0f0u).Peter Krefting2008-12-091-100/+117
| * | | | | | git gui: update Italian translationMichele Ballabio2008-12-091-90/+96
| * | | | | | git-gui: Update Japanese translation for 0.12Nanako Shiraishi2008-12-091-3/+8
| * | | | | | git-gui: Starting translation for NorwegianFredrik Skolmli2008-12-081-0/+2484
| * | | | | | git-gui: Update German (completed) translation.Christian Stimming2008-12-081-40/+239
| * | | | | | git-gui: Update po template to include 'Mirroring %s' messageShawn O. Pearce2008-12-081-89/+95
| * | | | | | git-gui: Fix commit encoding handling.Alexander Gavrilov2008-12-082-7/+5
| * | | | | | git-gui: Fix handling of relative paths in blame.Alexander Gavrilov2008-12-081-2/+16
* | | | | | | githooks documentation: add a note about the +x modeMiklos Vajna2008-12-171-0/+4
| |/ / / / / |/| | | | |
* | | | | | doc/git-reset: add reference to git-stashMarkus Heidelberg2008-12-171-0/+2
* | | | | | Documentation: fix description for enabling hooksMarkus Heidelberg2008-12-172-2/+4
* | | | | | git-daemon documentation: use {tilde}Miklos Vajna2008-12-171-2/+2
* | | | | | gitweb: do not run "git diff" that is PorcelainJunio C Hamano2008-12-171-37/+3
* | | | | | bash completion: Sync config variables with their man pagesLee Marlow2008-12-161-7/+80
* | | | | | bash completion: Sort config completion variablesLee Marlow2008-12-161-37/+40