summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'es/worktree-add'Junio C Hamano2015-08-124-38/+38
|\ \
| * | config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"Eric Sunshine2015-07-203-4/+3
| * | Documentation/git-worktree: wordsmith worktree-related manpagesMichael Haggerty2015-07-202-11/+12
| * | Documentation/config: fix stale "git prune --worktree" referenceMichael Haggerty2015-07-201-1/+1
| * | Documentation/git-worktree: fix incorrect reference to file "locked"Michael Haggerty2015-07-201-1/+1
| * | Documentation/git-worktree: consistently use term "linked working tree"Michael Haggerty2015-07-202-23/+23
* | | Merge branch 'ad/bisect-cleanup'Junio C Hamano2015-08-126-116/+266
|\ \ \
| * | | bisect: don't mix option parsing and non-trivial codead/bisect-cleanupMatthieu Moy2015-08-031-13/+17
| * | | bisect: simplify the addition of new bisect termsAntoine Delaite2015-08-034-12/+120
| * | | bisect: replace hardcoded "bad|good" by variablesAntoine Delaite2015-06-292-43/+68
| * | | Documentation/bisect: revise overall contentMichael Haggerty2015-06-261-54/+68
| * | | Documentation/bisect: move getting help section to the endMatthieu Moy2015-06-261-6/+5
| * | | bisect: correction of typoAntoine Delaite2015-06-232-2/+2
* | | | Sync with maintJunio C Hamano2015-08-033-4/+24
|\ \ \ \
| * \ \ \ Sync with 2.4.8Junio C Hamano2015-08-033-4/+24
| |\ \ \ \
| | * | | | Git 2.4.8v2.4.8Junio C Hamano2015-08-034-5/+25
| | * | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-032-1/+26
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano2015-08-031-13/+6
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'sg/completion-commit-cleanup' into maintJunio C Hamano2015-08-031-1/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-032-8/+104
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-033-7/+83
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-032-5/+28
| | |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | | First batch for 2.6Junio C Hamano2015-08-033-2/+156
* | | | | | | | | | | | Merge branch 'es/doc-clean-outdated-tools'Junio C Hamano2015-08-032-117/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/git-tools: retire manually-maintained listes/doc-clean-outdated-toolsEric Sunshine2015-07-281-81/+7
| * | | | | | | | | | | | Documentation/git-tools: drop references to defunct toolsEric Sunshine2015-07-281-31/+0
| * | | | | | | | | | | | Documentation/git-tools: fix item text formattingEric Sunshine2015-07-281-67/+67
| * | | | | | | | | | | | Documentation/git-tools: improve discoverability of Git wikiEric Sunshine2015-07-281-6/+3
| * | | | | | | | | | | | Documentation/git: drop outdated Cogito referenceEric Sunshine2015-07-251-1/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/refspec-parse-wildcard'Junio C Hamano2015-08-035-30/+41
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | refs: loosen restriction on wildcard "*" refspecsjk/refspec-parse-wildcardJacob Keller2015-07-275-27/+36
| * | | | | | | | | | | | refs: cleanup comments regarding check_refname_component()Jacob Keller2015-07-271-5/+7
* | | | | | | | | | | | | Merge branch 'da/subtree-date-confusion'Junio C Hamano2015-08-032-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | contrib/subtree: ignore log.date configurationda/subtree-date-confusionDavid Aguilar2015-07-232-1/+5
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jx/do-not-crash-receive-pack-wo-head'Junio C Hamano2015-08-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | receive-pack: crash when checking with non-exist HEADjx/do-not-crash-receive-pack-wo-headJiang Xin2015-07-221-1/+1
* | | | | | | | | | | | | | Merge branch 'db/send-pack-user-signingkey'Junio C Hamano2015-08-031-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | builtin/send-pack.c: respect user.signingkeydb/send-pack-user-signingkeyJunio C Hamano2015-07-211-0/+3
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'zb/userdiff-fountain'Junio C Hamano2015-08-034-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | userdiff: add support for Fountain documentszb/userdiff-fountainZoë Blade2015-07-234-0/+9
* | | | | | | | | | | | | | | Merge branch 'dt/refs-backend-preamble'Junio C Hamano2015-08-0313-86/+239
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-stash: use update-ref --create-reflog instead of creating filesdt/refs-backend-preambleDavid Turner2015-07-211-4/+2
| * | | | | | | | | | | | | | | update-ref and tag: add --create-reflog argDavid Turner2015-07-216-7/+74
| * | | | | | | | | | | | | | | refs: add REF_FORCE_CREATE_REFLOG flagDavid Turner2015-07-212-13/+22
| * | | | | | | | | | | | | | | git-reflog: add exists commandDavid Turner2015-07-213-1/+41
| * | | | | | | | | | | | | | | refs: new public ref function: safe_create_reflogDavid Turner2015-07-213-14/+26
| * | | | | | | | | | | | | | | refs: break out check for reflog autocreationDavid Turner2015-07-211-5/+11
| * | | | | | | | | | | | | | | refs.c: add err arguments to reflog functionsDavid Turner2015-07-213-60/+81
* | | | | | | | | | | | | | | | Merge branch 'as/sparse-checkout-removal'Junio C Hamano2015-08-032-0/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | unpack-trees: don't update files with CE_WT_REMOVE setas/sparse-checkout-removalDavid Turner2015-07-212-0/+56
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |