summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t1005: add test for "read-tree --reset -u A B"jk/two-way-merge-corner-case-fixJunio C Hamano2013-11-041-0/+15
* t1005: reindentJunio C Hamano2013-11-042-89/+89
* unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King2013-11-041-8/+17
* fsck: detect null sha1 in tree entriesJeff King2012-07-292-1/+33
* do not write null sha1s to on-disk indexJeff King2012-07-292-0/+21
* diff: do not use null sha1 as a sentinel valueJeff King2012-07-2914-32/+135
* Git 1.7.9.7v1.7.9.7maint-1.7.9Junio C Hamano2012-04-263-2/+16
* Sync with 1.7.8.6Junio C Hamano2012-04-264-3/+40
|\
| * Git 1.7.8.6v1.7.8.6maint-1.7.8Junio C Hamano2012-04-264-3/+27
| * Sync with 1.7.7.7Junio C Hamano2012-04-263-2/+16
| |\
| | * Git 1.7.7.7v1.7.7.7maint-1.7.7Junio C Hamano2012-04-264-3/+18
| | * bundle: remove stray single-quote from error messageJonathan Nieder2012-04-261-1/+1
* | | Merge branch 'maint-1.7.8' into maint-1.7.9Junio C Hamano2012-04-102-6/+6
|\ \ \ | |/ /
| * | Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8Junio C Hamano2012-04-091-4/+4
| |\ \
| | * | fetch/receive: remove over-pessimistic connectivity checkjc/maint-verify-objects-remove-pessimismJunio C Hamano2012-03-151-4/+4
| * | | Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8Junio C Hamano2012-04-091-2/+2
| |\ \ \
| | * | | Documentation/gitweb: trivial English fixesdw/gitweb-doc-grammoD Waitzman2012-03-231-2/+2
| * | | | Merge branch 'tr/cache-tree' into maint-1.7.8Junio C Hamano2012-04-0910-11/+142
| |\ \ \ \
| * \ \ \ \ Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8Junio C Hamano2012-04-092-4/+33
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8Junio C Hamano2012-04-091-6/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8Junio C Hamano2012-04-092-23/+36
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8Junio C Hamano2012-04-095-51/+67
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ph/rerere-doc' into maint-1.7.8Junio C Hamano2012-04-091-7/+12
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Git 1.7.9.6v1.7.9.6Junio C Hamano2012-04-024-4/+18
* | | | | | | | | | Merge branch 'jc/maint-merge-autoedit' into maintJunio C Hamano2012-04-022-3/+40
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge: backport GIT_MERGE_AUTOEDIT supportjc/maint-merge-autoeditJunio C Hamano2012-03-202-3/+40
* | | | | | | | | | | string-list: document that string_list_insert() inserts unique stringsHeiko Voigt2012-03-301-1/+3
* | | | | | | | | | | Git 1.7.9.5v1.7.9.5Junio C Hamano2012-03-264-3/+27
* | | | | | | | | | | Merge branch 'jn/maint-fast-import-empty-ls' into maintJunio C Hamano2012-03-262-0/+43
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fast-import: don't allow 'ls' of path with empty componentsjn/maint-fast-import-empty-lsJonathan Nieder2012-03-092-0/+41
| * | | | | | | | | | | fast-import: leakfix for 'ls' of dirty treesJonathan Nieder2012-03-091-0/+2
* | | | | | | | | | | | Merge branch 'ph/rerere-doc' into maintJunio C Hamano2012-03-261-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | rerere: Document 'rerere remaining'ph/rerere-docPhil Hord2012-03-081-7/+12
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ms/maint-config-error-at-eol-linecount' into maintJunio C Hamano2012-03-262-4/+40
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: report errors at the EOL with correct line numberms/maint-config-error-at-eol-linecountMartin Stenberg2012-03-122-4/+40
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | grep doc: add --break / --heading / -W to synopsisMark Lodato2012-03-261-0/+2
* | | | | | | | | | | Documentation: improve description of GIT_EDITOR and preference orderRodrigo Silva (MestreLion)2012-03-261-0/+6
* | | | | | | | | | | documentation: fix alphabetic ordered list for git-rebase man pageNelson Benitez Leon2012-03-261-2/+5
* | | | | | | | | | | Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-205-16/+34
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | / / / / / / | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8Junio C Hamano2012-03-201-3/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | t/Makefile: Use $(sort ...) explicitly where neededks/sort-wildcard-in-makefileKirill Smelkov2012-01-221-3/+3
| * | | | | | | | | | Merge branch 'jc/advise-i18n' into maint-1.7.8Junio C Hamano2012-03-202-12/+20
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | i18n of multi-line advice messagesjc/advise-i18nJunio C Hamano2011-12-222-12/+20
| * | | | | | | | | | | Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8Junio C Hamano2012-03-202-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | gitweb: Fix actionless dispatch for non-existent objectsjn/gitweb-unspecified-actionJakub Narebski2012-01-092-1/+11
* | | | | | | | | | | | Git 1.7.9.4v1.7.9.4Junio C Hamano2012-03-124-3/+28
* | | | | | | | | | | | Merge branch 'tr/maint-bundle-boundary' into maintJunio C Hamano2012-03-122-23/+36
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | bundle: keep around names passed to add_pending_object()tr/maint-bundle-boundaryThomas Rast2012-03-012-1/+16
| * | | | | | | | | | | t5510: ensure we stay in the toplevel test dirThomas Rast2012-03-011-8/+10
| * | | | | | | | | | | t5510: refactor bundle->pack conversionThomas Rast2012-03-011-14/+10
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
View Lorry Controller Status