summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Docs: send-email: Put options back into alphabetical orderMichael Witten2009-04-141-11/+11
* | | | | | | | | | | | Merge branch 'cc/bisect' (early part)Junio C Hamano2009-06-014-55/+59
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | bisect: check ancestors without forking a "git rev-list" processChristian Couder2009-05-182-44/+23
| * | | | | | | | | | | | commit: add function to unparse a commit and its parentsChristian Couder2009-05-182-0/+22
| * | | | | | | | | | | | bisect: rework some rev related functions to make them more reusableChristian Couder2009-05-181-11/+14
* | | | | | | | | | | | | git-add: no need for -f when resolving a conflict in already tracked pathJeff King2009-06-012-1/+13
* | | | | | | | | | | | | config.txt: document add.ignore-errorsStephen Boyd2009-06-011-0/+5
* | | | | | | | | | | | | bash: remove always true if statement from __git_ps1()SZEDER Gábor2009-06-011-6/+4
* | | | | | | | | | | | | git-apply(1): Clarify that one can select where to apply the patchBjörn Steinbrink2009-06-011-1/+1
* | | | | | | | | | | | | http-push: reuse existing is_null_refClemens Buchacher2009-06-011-16/+5
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2009-05-312-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-312-16/+18
* | | | | | | | | | | | | Merge branch 'sb/maint-1.6.2-opt-filename-fix'Junio C Hamano2009-05-306-0/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-244-0/+79
| * | | | | | | | | | | | commit: -F overrides -tStephen Boyd2009-05-242-0/+14
* | | | | | | | | | | | | Merge branch 'jc/maint-add-p-coalesce-fix'Junio C Hamano2009-05-302-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-172-2/+96
| * | | | | | | | | | | | | Splitting a hunk that adds a line at the top fails in "add -p"Matt Graham2009-05-171-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-242-1/+9
* | | | | | | | | | | | | | | t9120: don't expect failure with SVN_HTTPD_PORT unsetStephen Boyd2009-05-291-11/+6
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-05-292-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fix segfault showing an empty remoteClemens Buchacher2009-05-282-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-271-3/+51
| |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Update draft release notes to 1.6.4Junio C Hamano2009-05-261-1/+35
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-05-266-9/+68
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Prepare for 1.6.3.2Junio C Hamano2009-05-262-1/+52
| * | | | | | | | | | | | | | Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maintJunio C Hamano2009-05-261-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lt/maint-diff-reduce-lstat' into maintJunio C Hamano2009-05-262-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maintJunio C Hamano2009-05-262-1/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'do/maint-merge-recursive-fix' into maintJunio C Hamano2009-05-262-5/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-1.6.0-trace-argv' into maintJunio C Hamano2009-05-261-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'np/push-delta' into maintJunio C Hamano2009-05-263-8/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ar/merge-one-file-diag' into maintJunio C Hamano2009-05-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ar/unlink-err' into maintJunio C Hamano2009-05-2626-50/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-add-empty' into maintJunio C Hamano2009-05-261-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-251-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.6.2' into maintJunio C Hamano2009-05-251-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-05-251-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-251-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | http-push.c::remove_locks(): fix use after freeAlex Riesen2009-05-241-1/+2