Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cache.h: complete set of git_path_submodule helpers | Jeff King | 2015-08-10 | 2 | -5/+35 |
* | cache.h: clarify documentation for git_path, et al | Jeff King | 2015-08-10 | 1 | -5/+12 |
* | Sync with maint | Junio C Hamano | 2015-08-03 | 3 | -4/+24 |
|\ | |||||
| * | Sync with 2.4.8 | Junio C Hamano | 2015-08-03 | 3 | -4/+24 |
| |\ | |||||
| | * | Git 2.4.8v2.4.8 | Junio C Hamano | 2015-08-03 | 4 | -5/+25 |
| | * | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint | Junio C Hamano | 2015-08-03 | 2 | -1/+26 |
| | |\ | |||||
| | * \ | Merge branch 'ss/clone-guess-dir-name-simplify' into maint | Junio C Hamano | 2015-08-03 | 1 | -13/+6 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'sg/completion-commit-cleanup' into maint | Junio C Hamano | 2015-08-03 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'pt/am-abort-fix' into maint | Junio C Hamano | 2015-08-03 | 2 | -8/+104 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint | Junio C Hamano | 2015-08-03 | 3 | -7/+83 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'sg/commit-cleanup-scissors' into maint | Junio C Hamano | 2015-08-03 | 2 | -5/+28 |
| | |\ \ \ \ \ \ | |||||
* | | | | | | | | | First batch for 2.6 | Junio C Hamano | 2015-08-03 | 3 | -2/+156 |
* | | | | | | | | | Merge branch 'es/doc-clean-outdated-tools' | Junio C Hamano | 2015-08-03 | 2 | -117/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation/git-tools: retire manually-maintained listes/doc-clean-outdated-tools | Eric Sunshine | 2015-07-28 | 1 | -81/+7 |
| * | | | | | | | | | Documentation/git-tools: drop references to defunct tools | Eric Sunshine | 2015-07-28 | 1 | -31/+0 |
| * | | | | | | | | | Documentation/git-tools: fix item text formatting | Eric Sunshine | 2015-07-28 | 1 | -67/+67 |
| * | | | | | | | | | Documentation/git-tools: improve discoverability of Git wiki | Eric Sunshine | 2015-07-28 | 1 | -6/+3 |
| * | | | | | | | | | Documentation/git: drop outdated Cogito reference | Eric Sunshine | 2015-07-25 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'jk/refspec-parse-wildcard' | Junio C Hamano | 2015-08-03 | 5 | -30/+41 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | refs: loosen restriction on wildcard "*" refspecsjk/refspec-parse-wildcard | Jacob Keller | 2015-07-27 | 5 | -27/+36 |
| * | | | | | | | | | | refs: cleanup comments regarding check_refname_component() | Jacob Keller | 2015-07-27 | 1 | -5/+7 |
* | | | | | | | | | | | Merge branch 'da/subtree-date-confusion' | Junio C Hamano | 2015-08-03 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | contrib/subtree: ignore log.date configurationda/subtree-date-confusion | David Aguilar | 2015-07-23 | 2 | -1/+5 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jx/do-not-crash-receive-pack-wo-head' | Junio C Hamano | 2015-08-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | receive-pack: crash when checking with non-exist HEADjx/do-not-crash-receive-pack-wo-head | Jiang Xin | 2015-07-22 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'db/send-pack-user-signingkey' | Junio C Hamano | 2015-08-03 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | builtin/send-pack.c: respect user.signingkeydb/send-pack-user-signingkey | Junio C Hamano | 2015-07-21 | 1 | -0/+3 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'zb/userdiff-fountain' | Junio C Hamano | 2015-08-03 | 4 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | userdiff: add support for Fountain documentszb/userdiff-fountain | Zoë Blade | 2015-07-23 | 4 | -0/+9 |
* | | | | | | | | | | | | | Merge branch 'dt/refs-backend-preamble' | Junio C Hamano | 2015-08-03 | 13 | -86/+239 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | git-stash: use update-ref --create-reflog instead of creating filesdt/refs-backend-preamble | David Turner | 2015-07-21 | 1 | -4/+2 |
| * | | | | | | | | | | | | | update-ref and tag: add --create-reflog arg | David Turner | 2015-07-21 | 6 | -7/+74 |
| * | | | | | | | | | | | | | refs: add REF_FORCE_CREATE_REFLOG flag | David Turner | 2015-07-21 | 2 | -13/+22 |
| * | | | | | | | | | | | | | git-reflog: add exists command | David Turner | 2015-07-21 | 3 | -1/+41 |
| * | | | | | | | | | | | | | refs: new public ref function: safe_create_reflog | David Turner | 2015-07-21 | 3 | -14/+26 |
| * | | | | | | | | | | | | | refs: break out check for reflog autocreation | David Turner | 2015-07-21 | 1 | -5/+11 |
| * | | | | | | | | | | | | | refs.c: add err arguments to reflog functions | David Turner | 2015-07-21 | 3 | -60/+81 |
* | | | | | | | | | | | | | | Merge branch 'as/sparse-checkout-removal' | Junio C Hamano | 2015-08-03 | 2 | -0/+56 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | unpack-trees: don't update files with CE_WT_REMOVE setas/sparse-checkout-removal | David Turner | 2015-07-21 | 2 | -0/+56 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'jk/date-mode-format' | Junio C Hamano | 2015-08-03 | 28 | -78/+172 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | strbuf: make strbuf_addftime more robustjk/date-mode-format | Jeff King | 2015-07-20 | 2 | -17/+31 |
| * | | | | | | | | | | | | | | introduce "format" date-mode | Jeff King | 2015-06-29 | 8 | -1/+61 |
| * | | | | | | | | | | | | | | convert "enum date_mode" into a struct | Jeff King | 2015-06-29 | 23 | -77/+97 |
| * | | | | | | | | | | | | | | show-branch: use DATE_RELATIVE instead of magic number | Jeff King | 2015-06-29 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'pt/am-tests' | Junio C Hamano | 2015-08-03 | 4 | -0/+313 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t3901: test git-am encoding conversionpt/am-tests | Paul Tan | 2015-07-20 | 1 | -0/+62 |
| * | | | | | | | | | | | | | | t3418: non-interactive rebase --continue with rerere enabled | Paul Tan | 2015-07-20 | 1 | -0/+19 |
| * | | | | | | | | | | | | | | t4150: tests for am --[no-]scissors | Paul Tan | 2015-07-20 | 1 | -0/+48 |
| * | | | | | | | | | | | | | | t4150: am with post-applypatch hook | Paul Tan | 2015-07-20 | 1 | -0/+38 |
| * | | | | | | | | | | | | | | t4150: am with pre-applypatch hook | Paul Tan | 2015-07-20 | 1 | -0/+33 |