aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* cache.h: complete set of git_path_submodule helpersJeff King2015-08-10
* cache.h: clarify documentation for git_path, et alJeff King2015-08-10
* Sync with maintJunio C Hamano2015-08-03
|\
| * Sync with 2.4.8Junio C Hamano2015-08-03
| |\
| | * Git 2.4.8v2.4.8Junio C Hamano2015-08-03
| | * Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-03
| | |\
| | * \ Merge branch 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano2015-08-03
| | |\ \
| | * \ \ Merge branch 'sg/completion-commit-cleanup' into maintJunio C Hamano2015-08-03
| | |\ \ \
| | * \ \ \ Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-03
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-03
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-03
| | |\ \ \ \ \ \
* | | | | | | | | First batch for 2.6Junio C Hamano2015-08-03
* | | | | | | | | Merge branch 'es/doc-clean-outdated-tools'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/git-tools: retire manually-maintained listEric Sunshine2015-07-28
| * | | | | | | | | Documentation/git-tools: drop references to defunct toolsEric Sunshine2015-07-28
| * | | | | | | | | Documentation/git-tools: fix item text formattingEric Sunshine2015-07-28
| * | | | | | | | | Documentation/git-tools: improve discoverability of Git wikiEric Sunshine2015-07-28
| * | | | | | | | | Documentation/git: drop outdated Cogito referenceEric Sunshine2015-07-25
* | | | | | | | | | Merge branch 'jk/refspec-parse-wildcard'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | refs: loosen restriction on wildcard "*" refspecsJacob Keller2015-07-27
| * | | | | | | | | | refs: cleanup comments regarding check_refname_component()Jacob Keller2015-07-27
* | | | | | | | | | | Merge branch 'da/subtree-date-confusion'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | contrib/subtree: ignore log.date configurationDavid Aguilar2015-07-23
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jx/do-not-crash-receive-pack-wo-head'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | receive-pack: crash when checking with non-exist HEADJiang Xin2015-07-22
* | | | | | | | | | | | Merge branch 'db/send-pack-user-signingkey'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | builtin/send-pack.c: respect user.signingkeyJunio C Hamano2015-07-21
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'zb/userdiff-fountain'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | userdiff: add support for Fountain documentsZoë Blade2015-07-23
* | | | | | | | | | | | | Merge branch 'dt/refs-backend-preamble'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-stash: use update-ref --create-reflog instead of creating filesDavid Turner2015-07-21
| * | | | | | | | | | | | | update-ref and tag: add --create-reflog argDavid Turner2015-07-21
| * | | | | | | | | | | | | refs: add REF_FORCE_CREATE_REFLOG flagDavid Turner2015-07-21
| * | | | | | | | | | | | | git-reflog: add exists commandDavid Turner2015-07-21
| * | | | | | | | | | | | | refs: new public ref function: safe_create_reflogDavid Turner2015-07-21
| * | | | | | | | | | | | | refs: break out check for reflog autocreationDavid Turner2015-07-21
| * | | | | | | | | | | | | refs.c: add err arguments to reflog functionsDavid Turner2015-07-21
* | | | | | | | | | | | | | Merge branch 'as/sparse-checkout-removal'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | unpack-trees: don't update files with CE_WT_REMOVE setDavid Turner2015-07-21
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/date-mode-format'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | strbuf: make strbuf_addftime more robustJeff King2015-07-20
| * | | | | | | | | | | | | | introduce "format" date-modeJeff King2015-06-29
| * | | | | | | | | | | | | | convert "enum date_mode" into a structJeff King2015-06-29
| * | | | | | | | | | | | | | show-branch: use DATE_RELATIVE instead of magic numberJeff King2015-06-29
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'pt/am-tests'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t3901: test git-am encoding conversionPaul Tan2015-07-20
| * | | | | | | | | | | | | | t3418: non-interactive rebase --continue with rerere enabledPaul Tan2015-07-20
| * | | | | | | | | | | | | | t4150: tests for am --[no-]scissorsPaul Tan2015-07-20
| * | | | | | | | | | | | | | t4150: am with post-applypatch hookPaul Tan2015-07-20
| * | | | | | | | | | | | | | t4150: am with pre-applypatch hookPaul Tan2015-07-20