summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-12-15Force t5302 to use a single threadLibravatar Johannes Schindelin1-0/+1
2008-12-15Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fixLibravatar Junio C Hamano2-0/+119
2008-12-15merge-recursive: do not clobber untracked working tree garbageLibravatar Junio C Hamano2-1/+33
2008-12-15modify/delete conflict resolution overwrites untracked fileLibravatar Clemens Buchacher1-0/+87
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
2008-12-12mergetool: Don't keep temporary merge files unless told toLibravatar Charles Bailey2-0/+13
2008-12-12mergetool: Add prompt to continue after failing to merge a fileLibravatar Charles Bailey1-9/+43
2008-12-12git-branch: display sha1 on branch deletionLibravatar Brandon Casey2-2/+4
2008-12-12git-config.txt: fix a typoLibravatar Jim Meyering1-1/+1
2008-12-12autodetect number of CPUs by default when using threadsLibravatar Nicolas Pitre1-1/+4
2008-12-11Merge branch 'maint'Libravatar Junio C Hamano4-7/+64
2008-12-11fsck: reduce stack footprintLibravatar Linus Torvalds1-7/+31
2008-12-10gitweb: cache $parent_commit info in git_blame()Libravatar Jakub Narebski1-5/+11
2008-12-10Add support for a pdf version of the user manualLibravatar Miklos Vajna3-0/+22
2008-12-10rebase: improve error messages about dirty stateLibravatar Jeff King1-3/+6
2008-12-10make sure packs to be replaced are closed beforehandLibravatar Nicolas Pitre3-0/+33
2008-12-10Fix typo in comment in builtin-add.cLibravatar Alexander Potashev1-1/+1
2008-12-10git-gui: Update Hungarian translation for 0.12Libravatar Miklos Vajna1-90/+96
2008-12-10git-gui: Fixed typos in Swedish translation.Libravatar Peter Krefting1-3/+3
2008-12-10Fix t4031Libravatar Junio C Hamano1-1/+1
2008-12-10gitweb: A bit of code cleanup in git_blame()Libravatar Jakub Narebski1-28/+39
2008-12-09Merge branch 'maint'Libravatar Junio C Hamano3-13/+63
2008-12-09diff: respect textconv in rewrite diffsLibravatar Jeff King2-13/+59
2008-12-09diff: fix handling of binary rewrite diffsLibravatar Jeff King2-1/+48
2008-12-09gitweb: Move 'lineno' id from link to row element in git_blameLibravatar Jakub Narebski1-2/+1
2008-12-09Document "git-reset --merge"Libravatar Junio C Hamano1-1/+28
2008-12-09Fix typos in documentationLibravatar Alexander Potashev2-2/+2
2008-12-09git-p4: Fix regression in p4Where method.Libravatar Tor Arvid Lund1-3/+10
2008-12-09Improve language in git-merge.txt and related docsLibravatar Ralf Wildenhues9-49/+48
2008-12-09work around Python warnings from AsciiDocLibravatar Junio C Hamano1-9/+9
2008-12-09git-gui: Updated Swedish translation (515t0f0u).Libravatar Peter Krefting1-100/+117
2008-12-09git gui: update Italian translationLibravatar Michele Ballabio1-90/+96
2008-12-09git-gui: Update Japanese translation for 0.12Libravatar Nanako Shiraishi1-3/+8
2008-12-08Define linkgit macro in [macros] sectionLibravatar Alexey Borzenkov1-0/+3
2008-12-08git-svn: Make following parents atomicLibravatar Deskin Miller2-4/+54
2008-12-08git-gui: Starting translation for NorwegianLibravatar Fredrik Skolmli1-0/+2484
2008-12-08gitweb: Fix bug in insert_file() subroutineLibravatar Jakub Narebski2-1/+11
2008-12-08git-gui: Update German (completed) translation.Libravatar Christian Stimming1-40/+239
2008-12-08git-gui: Update po template to include 'Mirroring %s' messageLibravatar Shawn O. Pearce1-89/+95
2008-12-08git-gui: Fix commit encoding handling.Libravatar Alexander Gavrilov2-7/+5
2008-12-08git-gui: Fix handling of relative paths in blame.Libravatar Alexander Gavrilov1-2/+16
2008-12-07diff: allow turning on textconv explicitly for plumbingLibravatar Jeff King1-0/+4
2008-12-07reorder ALLOW_TEXTCONV option settingLibravatar Jeff King3-4/+4