summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2008-12-07read-cache.c: typofix in commentLibravatar Junio C Hamano1-1/+1
2008-12-07builtin-checkout.c: check error return from read_cache()Libravatar Junio C Hamano1-2/+5
2008-12-07Point "stale" 1.6.0.5 documentation from the main git documentation pageLibravatar Junio C Hamano1-1/+2
2008-12-07Revert "git-stash: use git rev-parse -q"Libravatar Junio C Hamano1-6/+6
2008-12-07Update draft release notes for 1.6.1Libravatar Junio C Hamano1-22/+1
2008-12-07Merge branch 'maint'Libravatar Junio C Hamano5-31/+55
2008-12-07GIT 1.6.0.5Libravatar Junio C Hamano1-15/+28
2008-12-07"git diff <tree>{3,}": do not reverse order of argumentsLibravatar Matt McCutchen3-3/+31
2008-12-07tag: delete TAG_EDITMSG only on successful tagLibravatar Jeff King1-8/+20
2008-12-07gitweb: Make project specific override for 'grep' feature workLibravatar Jakub Narebski1-0/+1
2008-12-07http.c: use 'git_config_string' to get 'curl_http_proxy'Libravatar Miklos Vajna1-7/+4
2008-12-07fetch-pack: Avoid memcpy() with src==dstLibravatar Thomas Rast1-1/+2
2008-12-06gitk: Fix bugs in blaming codeLibravatar Paul Mackerras1-3/+29
2008-12-05Update draft release notes to 1.6.1Libravatar Junio C Hamano1-1/+17
2008-12-05Merge branch 'jc/am-options'Libravatar Junio C Hamano12-5/+238
2008-12-05git-am: rename apply_opt_extra file to apply-optLibravatar Junio C Hamano2-3/+2
2008-12-04Test that git-am does not lose -C/-p/--whitespace optionsLibravatar Junio C Hamano11-0/+229
2008-12-04git-am: propagate --3way options as wellLibravatar Junio C Hamano1-2/+7
2008-12-04git-am: propagate -C<n>, -p<n> options as wellLibravatar Junio C Hamano1-7/+7
2008-12-04git-am --whitespace: do not lose the command line optionLibravatar Junio C Hamano1-4/+4
2008-12-04git-p4: Fix bug in p4Where method.Libravatar Tor Arvid Lund1-1/+9