summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ic/maint-rebase-i-abort'Junio C Hamano2010-06-212-1/+12
|\
| * rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort2010-06-112-1/+12
* | Merge branch 'jk/maint-advice-empty-amend'Junio C Hamano2010-06-211-0/+7
|\ \
| * | commit: give advice on empty amendJeff King2010-06-111-0/+7
| |/
* | Merge branch 'eb/core-eol'Junio C Hamano2010-06-2112-110/+570
|\ \
| * | Add "core.eol" config variableEyvind Bernhardsen2010-06-068-51/+188
| * | Rename the "crlf" attribute "text"Eyvind Bernhardsen2010-05-197-56/+91
| * | Add per-repository eol normalizationEyvind Bernhardsen2010-05-197-69/+215
| * | Add tests for per-repository eol normalizationEyvind Bernhardsen2010-05-191-0/+142
* | | Merge branch 'fg/autocrlf'Junio C Hamano2010-06-212-0/+101
|\ \ \ | |/ /
| * | autocrlf: Make it work also for un-normalized repositoriesFinn Arne Gangstad2010-05-112-0/+101
* | | Merge branch 'sm/branch-broken-ref'Junio C Hamano2010-06-211-6/+22
|\ \ \
| * | | branch: don't fail listing branches if one of the commits wasn't foundSimo Melenius2010-06-071-1/+4
| * | | branch: exit status now reflects if branch listing finds an errorSimo Melenius2010-06-071-6/+19
* | | | Merge branch 'rr/parse-date-refactor'Junio C Hamano2010-06-211-19/+37
|\ \ \ \
| * | | | Refactor parse_date for approxidate functionsRamkumar Ramachandra2010-06-071-19/+37
| |/ / /
* | | | Merge branch 'jn/document-rebase-i-p-limitation'Junio C Hamano2010-06-212-0/+33
|\ \ \ \
| * | | | rebase -i -p: document shortcomingsJonathan Nieder2010-06-112-0/+33
| | |_|/ | |/| |
* | | | Merge branch 'tc/commit-abbrev-fix'Junio C Hamano2010-06-212-6/+72
|\ \ \ \
| * | | | commit::print_summary(): don't use format_commit_message()Tay Ray Chuan2010-06-132-8/+6
| * | | | t7502-commit: add summary output tests for empty and merge commitsTay Ray Chuan2010-05-281-2/+27
| * | | | t7502-commit: add tests for summary outputTay Ray Chuan2010-05-281-0/+43
* | | | | Merge branch 'tr/receive-pack-aliased-update-fix'Junio C Hamano2010-06-211-2/+2
|\ \ \ \ \
| * | | | | check_aliased_update: strcpy() instead of strcat() to copyThomas Rast2010-06-111-2/+2
* | | | | | Merge branch 'gs/usage-to-stdout'Junio C Hamano2010-06-215-43/+61
|\ \ \ \ \ \
| * | | | | | parseopt: wrap rev-parse --parseopt usage for eval consumptionThomas Rast2010-06-134-16/+30
| * | | | | | print the usage string on stdout instead of stderrGiuseppe Scrivano2010-05-313-37/+41
* | | | | | | Merge branch 'js/async-thread'Junio C Hamano2010-06-2110-41/+117
|\ \ \ \ \ \ \
| * | | | | | | fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)Thomas Rast2010-06-111-3/+5
| * | | | | | | Enable threaded async procedures whenever pthreads is availableJohannes Sixt2010-03-104-14/+10
| * | | | | | | Dying in an async procedure should only exit the thread, not the process.Johannes Sixt2010-03-071-0/+34
| * | | | | | | Reimplement async procedures using pthreadsJohannes Sixt2010-03-073-20/+34
| * | | | | | | Windows: more pthreads functionsJohannes Sixt2010-03-072-0/+33
| * | | | | | | Fix signature of fcntl() compatibility dummyJohannes Sixt2010-03-071-1/+1
| * | | | | | | Make report() from usage.c public as vreportf() and use it.Johannes Sixt2010-03-074-14/+10
| * | | | | | | Modernize t5530-upload-pack-error.Johannes Sixt2010-03-071-9/+9
* | | | | | | | Merge branch 'gv/portable'Junio C Hamano2010-06-2165-162/+378
|\ \ \ \ \ \ \ \
| * | | | | | | | test-lib: use DIFF definition from GIT-BUILD-OPTIONSJunio C Hamano2010-06-112-10/+16
| * | | | | | | | build: propagate $DIFF to scriptsJunio C Hamano2010-06-052-1/+3
| * | | | | | | | Makefile: Tru64 portability fixGary V. Vaughan2010-06-021-0/+7
| * | | | | | | | Makefile: HP-UX 10.20 portability fixesGary V. Vaughan2010-06-021-0/+8
| * | | | | | | | Makefile: HPUX11 portability fixesGary V. Vaughan2010-06-021-0/+6
| * | | | | | | | Makefile: SunOS 5.6 portability fixGary V. Vaughan2010-05-311-0/+12
| * | | | | | | | inline declaration does not work on AIXGary V. Vaughan2010-05-311-0/+3
| * | | | | | | | Allow disabling "inline"Gary V. Vaughan2010-05-313-0/+14
| * | | | | | | | Some platforms lack socklen_t typeGary V. Vaughan2010-05-314-0/+54
| * | | | | | | | Make NO_{INET_NTOP,INET_PTON} configured independentlyGary V. Vaughan2010-05-312-7/+32
| * | | | | | | | Makefile: some platforms do not have hstrerror anywhereGary V. Vaughan2010-05-312-3/+15
| * | | | | | | | git-compat-util.h: some platforms with mmap() lack MAP_FAILED definitionGary V. Vaughan2010-05-311-1/+4
| * | | | | | | | test_cmp: do not use "diff -u" on platforms that lack oneGary V. Vaughan2010-05-312-0/+6