summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'jn/gitweb-utf8'Junio C Hamano2008-12-031-16/+16
|\ \ \
| * | | gitweb: Fix handling of non-ASCII characters in inserted HTML filesJakub Narebski2008-12-021-16/+16
* | | | add stage to gitignoreJeff King2008-12-031-0/+1
* | | | submodule: use git rev-parse -qMiklos Vajna2008-12-031-3/+3
* | | | rebase: use git rev-parse -qMiklos Vajna2008-12-031-2/+2
* | | | pull: use git rev-parse -qMiklos Vajna2008-12-031-4/+4
* | | | lost-found: use git rev-parse -qMiklos Vajna2008-12-031-1/+1
* | | | filter-branch: use git rev-parse -qMiklos Vajna2008-12-031-1/+1
* | | | Merge branch 'jc/rm-i-t-a'Junio C Hamano2008-12-038-32/+187
|\ \ \ \
| * | | | git add --intent-to-add: do not let an empty blob be committed by accidentJunio C Hamano2008-11-305-5/+45
| * | | | git add --intent-to-add: fix removal of cached emptinessJunio C Hamano2008-11-284-4/+7
| * | | | builtin-rm.c: explain and clarify the "local change" logicJunio C Hamano2008-11-281-11/+42
| * | | | Merge branch 'nd/narrow' (early part) into jc/add-i-t-aJunio C Hamano2008-11-282-14/+95
| |\ \ \ \
| | * | | | Extend index to save more flagsNguyễn Thái Ngọc Duy2008-10-122-14/+95
* | | | | | Merge branch 'maint'Junio C Hamano2008-12-030-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'jk/maint-commit-v-strip' into maintJunio C Hamano2008-12-022-3/+78
| |\ \ \ \ \
| * | | | | | xdiff: give up scanning similar lines earlyDavide Libenzi2008-12-021-2/+13
| * | | | | | Merge branch 'bc/maint-keep-pack' into maintJunio C Hamano2008-12-029-36/+137
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/mingw-rename-fix' into maintJunio C Hamano2008-12-021-3/+12
| |\ \ \ \ \ \ \
* | | | | | | | | Install git-stage in exec-pathJunio C Hamano2008-12-031-0/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | git-stash: use git rev-parse -qMiklos Vajna2008-12-021-6/+6
* | | | | | | | Merge branch 'maint'Junio C Hamano2008-12-021-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | User's Manual: remove duplicated url at the end of Appendix BMiklos Vajna2008-12-021-1/+0
* | | | | | | | t4030-diff-textconv: Make octal escape sequence more portableJohannes Sixt2008-12-021-1/+1
* | | | | | | | Add a built-in alias for 'stage' to the 'add' commandScott Chacon2008-12-022-0/+20
* | | | | | | | Add backslash to list of 'crud' characters in real nameLinus Torvalds2008-12-021-0/+1
* | | | | | | | Makefile: introduce NO_PTHREADSJunio C Hamano2008-12-024-1/+31