summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Get rid of the last remnants of GIT_CONFIG_LOCALv1.6.1-rc3Johannes Schindelin2008-12-144-8/+3
* Documentation: Describe git-gui Tools menu configuration options.Alexander Gavrilov2008-12-141-0/+51
* git-fast-import possible memory corruption problemYONETANI Tomokazu2008-12-141-3/+4
* builtin-commit: remove unused message variableMarkus Heidelberg2008-12-131-5/+0
* Merge branch 'maint'Junio C Hamano2008-12-121-1/+1
|\
| * git-config.txt: fix a typoJim Meyering2008-12-121-1/+1
* | git-branch: display sha1 on branch deletionBrandon Casey2008-12-122-2/+4
* | Merge branch 'maint'Junio C Hamano2008-12-114-7/+64
|\ \ | |/
| * fsck: reduce stack footprintLinus Torvalds2008-12-111-7/+31
| * make sure packs to be replaced are closed beforehandNicolas Pitre2008-12-103-0/+33
* | rebase: improve error messages about dirty stateJeff King2008-12-101-3/+6
* | Fix typo in comment in builtin-add.cAlexander Potashev2008-12-101-1/+1
* | Fix t4031Junio C Hamano2008-12-101-1/+1
* | Merge branch 'maint'Junio C Hamano2008-12-093-13/+63
|\ \ | |/
| * work around Python warnings from AsciiDocJunio C Hamano2008-12-091-9/+9
| * git-svn: Make following parents atomicDeskin Miller2008-12-082-4/+54
* | diff: respect textconv in rewrite diffsJeff King2008-12-092-13/+59
* | diff: fix handling of binary rewrite diffsJeff King2008-12-092-1/+48
* | Fix typos in documentationAlexander Potashev2008-12-092-2/+2
* | git-p4: Fix regression in p4Where method.Tor Arvid Lund2008-12-091-3/+10
* | Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-099-49/+48
* | Define linkgit macro in [macros] sectionAlexey Borzenkov2008-12-081-0/+3
* | gitweb: Fix bug in insert_file() subroutineJakub Narebski2008-12-082-1/+11
* | diff: allow turning on textconv explicitly for plumbingJeff King2008-12-071-0/+4
* | reorder ALLOW_TEXTCONV option settingJeff King2008-12-073-4/+4
* | read-cache.c: typofix in commentJunio C Hamano2008-12-071-1/+1
* | builtin-checkout.c: check error return from read_cache()Junio C Hamano2008-12-071-2/+5
* | Point "stale" 1.6.0.5 documentation from the main git documentation pagev1.6.1-rc2Junio C Hamano2008-12-071-1/+2
* | Revert "git-stash: use git rev-parse -q"Junio C Hamano2008-12-071-6/+6
* | Update draft release notes for 1.6.1Junio C Hamano2008-12-071-22/+1
* | Merge branch 'maint'Junio C Hamano2008-12-075-31/+55
|\ \ | |/
| * GIT 1.6.0.5v1.6.0.5Junio C Hamano2008-12-071-15/+28
| * "git diff <tree>{3,}": do not reverse order of argumentsMatt McCutchen2008-12-073-3/+31
| * tag: delete TAG_EDITMSG only on successful tagJeff King2008-12-071-8/+20
| * gitweb: Make project specific override for 'grep' feature workJakub Narebski2008-12-071-0/+1
| * http.c: use 'git_config_string' to get 'curl_http_proxy'Miklos Vajna2008-12-071-7/+4
| * fetch-pack: Avoid memcpy() with src==dstThomas Rast2008-12-071-1/+2
* | Update draft release notes to 1.6.1Junio C Hamano2008-12-051-1/+17
* | Merge branch 'jc/am-options'Junio C Hamano2008-12-0512-5/+238
|\ \
| * | git-am: rename apply_opt_extra file to apply-optJunio C Hamano2008-12-052-3/+2
| * | Test that git-am does not lose -C/-p/--whitespace optionsJunio C Hamano2008-12-0411-0/+229
| * | git-am: propagate --3way options as wellJunio C Hamano2008-12-041-2/+7
| * | git-am: propagate -C<n>, -p<n> options as wellJunio C Hamano2008-12-041-7/+7
| * | git-am --whitespace: do not lose the command line optionJunio C Hamano2008-12-041-4/+4
* | | git-p4: Fix bug in p4Where method.Tor Arvid Lund2008-12-041-1/+9
* | | Report symlink failures in merge-recursiveAlex Riesen2008-12-041-1/+2
* | | Make chdir failures visibleAlex Riesen2008-12-042-3/+4
* | | Make some of fwrite/fclose/write/close failures visibleAlex Riesen2008-12-043-15/+45
|/ /
* | Merge branch 'dm/svn-remote'Junio C Hamano2008-12-032-1/+20
|\ \
| * | git-svn: Make branch use correct svn-remoteDeskin Miller2008-12-032-1/+20