summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mw/send-email'Junio C Hamano2009-05-312-20/+27
|\
| * send-email: Remove superfluous `my $editor = ...'Michael Witten2009-04-141-2/+0
| * send-email: 'References:' should only reference what is sentMichael Witten2009-04-141-4/+10
| * send-email: Handle "GIT:" rather than "GIT: " during --composeMichael Witten2009-04-141-2/+2
| * Docs: send-email: --smtp-server-port can take symbolic portsMichael Witten2009-04-141-1/+3
| * Docs: send-email: Refer to CONFIGURATION section for sendemail.multieditMichael Witten2009-04-141-3/+4
| * Docs: send-email: Put options back into alphabetical orderMichael Witten2009-04-141-11/+11
* | Merge branch 'cc/bisect' (early part)Junio C Hamano2009-05-314-55/+59
|\ \
| * | bisect: check ancestors without forking a "git rev-list" processChristian Couder2009-05-172-44/+23
| * | commit: add function to unparse a commit and its parentsChristian Couder2009-05-172-0/+22
| * | bisect: rework some rev related functions to make them more reusableChristian Couder2009-05-171-11/+14
* | | git-add: no need for -f when resolving a conflict in already tracked pathJeff King2009-05-312-1/+13
* | | config.txt: document add.ignore-errorsStephen Boyd2009-05-311-0/+5
* | | 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