Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/free-tree-buffer' | Junio C Hamano | 2013-09-17 | 10 | -23/+24 |
|\ | |||||
| * | clear parsed flag when we free tree buffersjk/free-tree-buffer | Jeff King | 2013-06-06 | 10 | -23/+24 |
* | | Merge branch 'maint' | Junio C Hamano | 2013-09-17 | 1 | -1/+1 |
|\ \ | |||||
| * | | t7406-submodule-update: add missing && | Tay Ray Chuan | 2013-09-17 | 1 | -1/+1 |
* | | | Sync with maint for l10n updates | Junio C Hamano | 2013-09-12 | 1 | -11/+11 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2013-09-11 | 1 | -11/+11 |
| |\ \ | |||||
| | * | | l10n: de.po: use "das Tag" instead of "der Tag" | Ralf Thielow | 2013-09-08 | 1 | -11/+11 |
* | | | | Update draft release notes to 1.8.5 for the third batch of topics | Junio C Hamano | 2013-09-12 | 1 | -0/+4 |
* | | | | Merge branch 'jc/pager-configuration-doc' | Junio C Hamano | 2013-09-12 | 1 | -16/+14 |
|\ \ \ \ | |||||
| * | | | | config: rewrite core.pager documentationjc/pager-configuration-doc | Junio C Hamano | 2013-08-29 | 1 | -16/+14 |
* | | | | | Merge branch 'mm/remote-helpers-doc' | Junio C Hamano | 2013-09-12 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation/remote-helpers: document common use-case for private refmm/remote-helpers-doc | Matthieu Moy | 2013-08-26 | 1 | -0/+6 |
* | | | | | | Merge branch 'mn/doc-pack-heu-remove-dead-pastebin' | Junio C Hamano | 2013-09-12 | 1 | -6/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove dead pastebin link from pack-heuristics documentmn/doc-pack-heu-remove-dead-pastebin | Michal Nazarewicz | 2013-08-23 | 1 | -6/+0 |
* | | | | | | | Merge branch 'mm/fast-import-feature-doc' | Junio C Hamano | 2013-09-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation/fast-import: clarify summary for `feature` commandmm/fast-import-feature-doc | Matthieu Moy | 2013-08-25 | 1 | -2/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mm/mediawiki-dumb-push-fix' | Junio C Hamano | 2013-09-12 | 6 | -4/+34 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-remote-mediawiki: no need to update private ref in non-dumb pushmm/mediawiki-dumb-push-fix | Matthieu Moy | 2013-09-03 | 1 | -1/+0 |
| * | | | | | | | git-remote-mediawiki: use no-private-update capability on dumb push | Matthieu Moy | 2013-09-03 | 1 | -0/+3 |
| * | | | | | | | transport-helper: add no-private-update capability | Matthieu Moy | 2013-09-03 | 4 | -2/+22 |
| * | | | | | | | git-remote-mediawiki: add test and check Makefile targets | Matthieu Moy | 2013-08-29 | 1 | -1/+9 |
* | | | | | | | | Merge branch 'jc/commit-is-spelled-with-two-ems' | Junio C Hamano | 2013-09-12 | 5 | -11/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | typofix: cherry is spelled with two arsjc/commit-is-spelled-with-two-ems | Junio C Hamano | 2013-09-05 | 2 | -2/+2 |
| * | | | | | | | | typofix: commit is spelled with two ems | Junio C Hamano | 2013-09-04 | 3 | -9/+9 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/config-int-range-check' | Junio C Hamano | 2013-09-12 | 5 | -24/+83 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-config: always treat --int as 64-bit internally | Jeff King | 2013-09-09 | 4 | -3/+29 |
| * | | | | | | | | config: make numeric parsing errors more clear | Jeff King | 2013-09-09 | 3 | -9/+16 |
| * | | | | | | | | config: set errno in numeric git_parse_* functions | Jeff King | 2013-09-09 | 1 | -4/+14 |
| * | | | | | | | | config: properly range-check integer values | Jeff King | 2013-09-09 | 1 | -6/+6 |
| * | | | | | | | | config: factor out integer parsing from range checks | Jeff King | 2013-09-09 | 1 | -6/+22 |
* | | | | | | | | | Update draft release notes to 1.8.5 | Junio C Hamano | 2013-09-11 | 1 | -0/+32 |
* | | | | | | | | | Merge branch 'jc/ls-files-killed-optim' | Junio C Hamano | 2013-09-11 | 4 | -17/+67 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | dir.c::test_one_path(): work around directory_exists_in_index_icase() breakagejc/ls-files-killed-optim | Eric Sunshine | 2013-08-23 | 2 | -9/+24 |
| * | | | | | | | | | t3010: update to demonstrate "ls-files -k" optimization pitfalls | Junio C Hamano | 2013-08-15 | 1 | -3/+9 |
| * | | | | | | | | | ls-files -k: a directory only can be killed if the index has a non-directory | Junio C Hamano | 2013-08-15 | 3 | -3/+31 |
| * | | | | | | | | | dir.c: use the cache_* macro to access the current index | Junio C Hamano | 2013-08-15 | 1 | -6/+5 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'es/rebase-i-no-abbrev' | Junio C Hamano | 2013-09-11 | 2 | -2/+117 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase -i: fix short SHA-1 collisiones/rebase-i-no-abbrev | Junio C Hamano | 2013-08-25 | 2 | -1/+31 |
| * | | | | | | | | | t3404: rebase -i: demonstrate short SHA-1 collision | Eric Sunshine | 2013-08-25 | 1 | -0/+24 |
| * | | | | | | | | | t3404: make tests more self-contained | Eric Sunshine | 2013-08-25 | 1 | -2/+63 |
* | | | | | | | | | | Merge branch 'rt/rebase-p-no-merge-summary' | Junio C Hamano | 2013-09-11 | 2 | -1/+25 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rebase --preserve-merges: ignore "merge.log" configrt/rebase-p-no-merge-summary | Ralf Thielow | 2013-08-21 | 2 | -1/+25 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'tf/gitweb-ss-tweak' | Junio C Hamano | 2013-09-11 | 2 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | gitweb: make search help link less uglytf/gitweb-ss-tweak | Tony Finch | 2013-08-20 | 1 | -2/+2 |
| * | | | | | | | | | | gitweb: omit the repository owner when it is unset | Tony Finch | 2013-08-20 | 1 | -1/+1 |
| * | | | | | | | | | | gitweb: vertically centre contents of page footer | Tony Finch | 2013-08-20 | 1 | -1/+2 |
| * | | | | | | | | | | gitweb: ensure OPML text fits inside its box | Tony Finch | 2013-08-20 | 1 | -2/+1 |
* | | | | | | | | | | | Merge branch 'sb/mailmap-freeing-NULL-is-ok' | Junio C Hamano | 2013-09-11 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | mailmap: remove redundant check for freeing memorysb/mailmap-freeing-NULL-is-ok | Stefan Beller | 2013-08-20 | 1 | -2/+1 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'js/xread-in-full' | Junio C Hamano | 2013-09-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ |