Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ic/maint-rebase-i-abort' | Junio C Hamano | 2010-06-21 | 2 | -1/+12 |
|\ | |||||
| * | rebase -i: Abort cleanly if new base cannot be checked out | Ian Ward Comfort | 2010-06-11 | 2 | -1/+12 |
* | | Merge branch 'jk/maint-advice-empty-amend' | Junio C Hamano | 2010-06-21 | 1 | -0/+7 |
|\ \ | |||||
| * | | commit: give advice on empty amend | Jeff King | 2010-06-11 | 1 | -0/+7 |
| |/ | |||||
* | | Merge branch 'eb/core-eol' | Junio C Hamano | 2010-06-21 | 12 | -110/+570 |
|\ \ | |||||
| * | | Add "core.eol" config variable | Eyvind Bernhardsen | 2010-06-06 | 8 | -51/+188 |
| * | | Rename the "crlf" attribute "text" | Eyvind Bernhardsen | 2010-05-19 | 7 | -56/+91 |
| * | | Add per-repository eol normalization | Eyvind Bernhardsen | 2010-05-19 | 7 | -69/+215 |
| * | | Add tests for per-repository eol normalization | Eyvind Bernhardsen | 2010-05-19 | 1 | -0/+142 |
* | | | Merge branch 'fg/autocrlf' | Junio C Hamano | 2010-06-21 | 2 | -0/+101 |
|\ \ \ | |/ / | |||||
| * | | autocrlf: Make it work also for un-normalized repositories | Finn Arne Gangstad | 2010-05-11 | 2 | -0/+101 |
* | | | Merge branch 'sm/branch-broken-ref' | Junio C Hamano | 2010-06-21 | 1 | -6/+22 |
|\ \ \ | |||||
| * | | | branch: don't fail listing branches if one of the commits wasn't found | Simo Melenius | 2010-06-07 | 1 | -1/+4 |
| * | | | branch: exit status now reflects if branch listing finds an error | Simo Melenius | 2010-06-07 | 1 | -6/+19 |
* | | | | Merge branch 'rr/parse-date-refactor' | Junio C Hamano | 2010-06-21 | 1 | -19/+37 |
|\ \ \ \ | |||||
| * | | | | Refactor parse_date for approxidate functions | Ramkumar Ramachandra | 2010-06-07 | 1 | -19/+37 |
| |/ / / | |||||
* | | | | Merge branch 'jn/document-rebase-i-p-limitation' | Junio C Hamano | 2010-06-21 | 2 | -0/+33 |
|\ \ \ \ | |||||
| * | | | | rebase -i -p: document shortcomings | Jonathan Nieder | 2010-06-11 | 2 | -0/+33 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'tc/commit-abbrev-fix' | Junio C Hamano | 2010-06-21 | 2 | -6/+72 |
|\ \ \ \ | |||||
| * | | | | commit::print_summary(): don't use format_commit_message() | Tay Ray Chuan | 2010-06-13 | 2 | -8/+6 |
| * | | | | t7502-commit: add summary output tests for empty and merge commits | Tay Ray Chuan | 2010-05-28 | 1 | -2/+27 |
| * | | | | t7502-commit: add tests for summary output | Tay Ray Chuan | 2010-05-28 | 1 | -0/+43 |
* | | | | | Merge branch 'tr/receive-pack-aliased-update-fix' | Junio C Hamano | 2010-06-21 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | check_aliased_update: strcpy() instead of strcat() to copy | Thomas Rast | 2010-06-11 | 1 | -2/+2 |
* | | | | | | Merge branch 'gs/usage-to-stdout' | Junio C Hamano | 2010-06-21 | 5 | -43/+61 |
|\ \ \ \ \ \ | |||||
| * | | | | | | parseopt: wrap rev-parse --parseopt usage for eval consumption | Thomas Rast | 2010-06-13 | 4 | -16/+30 |
| * | | | | | | print the usage string on stdout instead of stderr | Giuseppe Scrivano | 2010-05-31 | 3 | -37/+41 |
* | | | | | | | Merge branch 'js/async-thread' | Junio C Hamano | 2010-06-21 | 10 | -41/+117 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f) | Thomas Rast | 2010-06-11 | 1 | -3/+5 |
| * | | | | | | | Enable threaded async procedures whenever pthreads is available | Johannes Sixt | 2010-03-10 | 4 | -14/+10 |
| * | | | | | | | Dying in an async procedure should only exit the thread, not the process. | Johannes Sixt | 2010-03-07 | 1 | -0/+34 |
| * | | | | | | | Reimplement async procedures using pthreads | Johannes Sixt | 2010-03-07 | 3 | -20/+34 |
| * | | | | | | | Windows: more pthreads functions | Johannes Sixt | 2010-03-07 | 2 | -0/+33 |
| * | | | | | | | Fix signature of fcntl() compatibility dummy | Johannes Sixt | 2010-03-07 | 1 | -1/+1 |
| * | | | | | | | Make report() from usage.c public as vreportf() and use it. | Johannes Sixt | 2010-03-07 | 4 | -14/+10 |
| * | | | | | | | Modernize t5530-upload-pack-error. | Johannes Sixt | 2010-03-07 | 1 | -9/+9 |
* | | | | | | | | Merge branch 'gv/portable' | Junio C Hamano | 2010-06-21 | 65 | -162/+378 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | test-lib: use DIFF definition from GIT-BUILD-OPTIONS | Junio C Hamano | 2010-06-11 | 2 | -10/+16 |
| * | | | | | | | | build: propagate $DIFF to scripts | Junio C Hamano | 2010-06-05 | 2 | -1/+3 |
| * | | | | | | | | Makefile: Tru64 portability fix | Gary V. Vaughan | 2010-06-02 | 1 | -0/+7 |
| * | | | | | | | | Makefile: HP-UX 10.20 portability fixes | Gary V. Vaughan | 2010-06-02 | 1 | -0/+8 |
| * | | | | | | | | Makefile: HPUX11 portability fixes | Gary V. Vaughan | 2010-06-02 | 1 | -0/+6 |
| * | | | | | | | | Makefile: SunOS 5.6 portability fix | Gary V. Vaughan | 2010-05-31 | 1 | -0/+12 |
| * | | | | | | | | inline declaration does not work on AIX | Gary V. Vaughan | 2010-05-31 | 1 | -0/+3 |
| * | | | | | | | | Allow disabling "inline" | Gary V. Vaughan | 2010-05-31 | 3 | -0/+14 |
| * | | | | | | | | Some platforms lack socklen_t type | Gary V. Vaughan | 2010-05-31 | 4 | -0/+54 |
| * | | | | | | | | Make NO_{INET_NTOP,INET_PTON} configured independently | Gary V. Vaughan | 2010-05-31 | 2 | -7/+32 |
| * | | | | | | | | Makefile: some platforms do not have hstrerror anywhere | Gary V. Vaughan | 2010-05-31 | 2 | -3/+15 |
| * | | | | | | | | git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition | Gary V. Vaughan | 2010-05-31 | 1 | -1/+4 |
| * | | | | | | | | test_cmp: do not use "diff -u" on platforms that lack one | Gary V. Vaughan | 2010-05-31 | 2 | -0/+6 |