summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bash: remove always true if statement from __git_ps1()SZEDER Gábor2009-05-311-6/+4
* git-apply(1): Clarify that one can select where to apply the patchBjörn Steinbrink2009-05-311-1/+1
* http-push: reuse existing is_null_refClemens Buchacher2009-05-311-16/+5
* Merge git://git.bogomips.org/git-svnJunio C Hamano2009-05-302-3/+61
|\
| * git-svn: refuse to dcommit non-UTF-8 messagesEric Wong2009-05-282-3/+61
* | Documentation: teach stash/pop workflow instead of stash/applyThomas Rast2009-05-302-16/+18
* | Merge branch 'sb/maint-1.6.2-opt-filename-fix'Junio C Hamano2009-05-296-0/+93
|\ \
| * | apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-234-0/+79
| * | commit: -F overrides -tStephen Boyd2009-05-232-0/+14
* | | Merge branch 'jc/maint-add-p-coalesce-fix'Junio C Hamano2009-05-292-1/+133
|\ \ \
| * | | t3701: ensure correctly set up repository after skipped testsJohannes Sixt2009-05-251-0/+6
| * | | Revert "git-add--interactive: remove hunk coalescing"Junio C Hamano2009-05-162-2/+96
| * | | Splitting a hunk that adds a line at the top fails in "add -p"Matt Graham2009-05-161-0/+32
* | | | Merge branch 'rs/maint-grep-word-regexp-fix'Junio C Hamano2009-05-292-1/+9
|\ \ \ \
| * | | | grep: fix word-regexp at the beginning of linesRené Scharfe2009-05-232-1/+9
* | | | | t9120: don't expect failure with SVN_HTTPD_PORT unsetStephen Boyd2009-05-291-11/+6
* | | | | Merge branch 'maint'Junio C Hamano2009-05-282-4/+14
|\ \ \ \ \
| * | | | | fix segfault showing an empty remoteClemens Buchacher2009-05-272-4/+14
* | | | | | t5500: Modernize test styleStephen Boyd2009-05-271-127/+149
* | | | | | completion: fix PS1 display during an AM on detached HEADJunio C Hamano2009-05-271-13/+11
* | | | | | imap-send: add support for IPv6Benjamin Kramer2009-05-261-3/+51
| |_|_|_|/ |/| | | |
* | | | | Update draft release notes to 1.6.4Junio C Hamano2009-05-251-1/+35
* | | | | Merge branch 'maint'Junio C Hamano2009-05-256-9/+68
|\ \ \ \ \ | |/ / / /
| * | | | Prepare for 1.6.3.2Junio C Hamano2009-05-252-1/+52
| * | | | Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maintJunio C Hamano2009-05-251-0/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'lt/maint-diff-reduce-lstat' into maintJunio C Hamano2009-05-252-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maintJunio C Hamano2009-05-252-1/+20
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'do/maint-merge-recursive-fix' into maintJunio C Hamano2009-05-252-5/+101
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-1.6.0-trace-argv' into maintJunio C Hamano2009-05-251-4/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'np/push-delta' into maintJunio C Hamano2009-05-253-8/+23
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ar/merge-one-file-diag' into maintJunio C Hamano2009-05-250-0/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ar/unlink-err' into maintJunio C Hamano2009-05-2526-50/+68
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-add-empty' into maintJunio C Hamano2009-05-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fix cat-file usage message and documentationJeff King2009-05-252-4/+4
| * | | | | | | | | | | | | fetch: report ref storage DF errors more accuratelyJeff King2009-05-251-3/+8
| * | | | | | | | | | | | | lock_ref: inform callers of unavailable refJeff King2009-05-251-1/+3
| * | | | | | | | | | | | | merge-options.txt: Clarify merge --squashMichael J Gruber2009-05-251-1/+2
* | | | | | | | | | | | | | convert bare readlink to strbuf_readlinkJeff King2009-05-251-7/+4
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-05-241-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'maint-1.6.2' into maintJunio C Hamano2009-05-241-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-05-241-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-241-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | http-push.c::remove_locks(): fix use after freeAlex Riesen2009-05-241-1/+2
* | | | | | | | | | | | | | | t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to CNguyễn Thái Ngọc Duy2009-05-241-0/+31
* | | | | | | | | | | | | | | post-receive-email: hooks.showrev: show how to include both web link and patchJim Meyering2009-05-231-0/+4
* | | | | | | | | | | | | | | MinGW: Fix compiler warning in merge-recursiveJohannes Schindelin2009-05-231-2/+3
* | | | | | | | | | | | | | | MinGW: Add a simple getpass()Johannes Schindelin2009-05-232-0/+17
* | | | | | | | | | | | | | | MinGW: use POSIX signature of waitpid()Johannes Schindelin2009-05-231-1/+1
* | | | | | | | | | | | | | | MinGW: the path separator to split GITPERLLIB is ';' on Win32Johannes Schindelin2009-05-231-1/+3
* | | | | | | | | | | | | | | MinGW: Scan for \r in addition to \n when reading shbang linesPeter Harris2009-05-231-2/+2