summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Sync with maintJunio C Hamano2015-08-032-2/+24
|\
| * Sync with 2.4.8Junio C Hamano2015-08-032-2/+24
| |\
| | * Git 2.4.8v2.4.8Junio C Hamano2015-08-032-1/+23
* | | First batch for 2.6Junio C Hamano2015-08-031-0/+154
* | | 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-031-2/+2
|\ \ \ \
| * | | | refs: loosen restriction on wildcard "*" refspecsjk/refspec-parse-wildcardJacob Keller2015-07-271-2/+2
* | | | | Merge branch 'zb/userdiff-fountain'Junio C Hamano2015-08-031-0/+2
|\ \ \ \ \
| * | | | | userdiff: add support for Fountain documentszb/userdiff-fountainZoë Blade2015-07-231-0/+2
* | | | | | Merge branch 'dt/refs-backend-preamble'Junio C Hamano2015-08-033-2/+12
|\ \ \ \ \ \
| * | | | | | update-ref and tag: add --create-reflog argDavid Turner2015-07-212-2/+8
| * | | | | | git-reflog: add exists commandDavid Turner2015-07-211-0/+4
| |/ / / / /
* | | | | | Merge branch 'jk/date-mode-format'Junio C Hamano2015-08-031-0/+5
|\ \ \ \ \ \
| * | | | | | introduce "format" date-modeJeff King2015-06-291-0/+5
| |/ / / / /
* | | | | | Merge branch 'se/doc-checkout-ours-theirs'Junio C Hamano2015-08-031-0/+15
|\ \ \ \ \ \
| * | | | | | checkout: document subtlety around --ours/--theirsse/doc-checkout-ours-theirsSimon A. Eugster2015-07-121-0/+15
* | | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string'Junio C Hamano2015-08-031-2/+2
|\ \ \ \ \ \ \
| * | | | | | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-stringIlya Bobyr2015-07-151-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'kn/tag-doc-fix'Junio C Hamano2015-08-031-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Documentation/tag: remove double occurance of "<pattern>"kn/tag-doc-fixKarthik Nayak2015-07-101-1/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mh/fast-import-get-mark'Junio C Hamano2015-08-031-6/+33
|\ \ \ \ \ \ \
| * | | | | | | fast-import: add a get-mark commandmh/fast-import-get-markMichael Haggerty2015-07-011-6/+33
* | | | | | | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-08-032-0/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | git rebase -i: warn about removed commitsGalan Rémi2015-06-302-0/+17
| * | | | | | | | git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-301-0/+3
* | | | | | | | | Merge branch 'dt/log-follow-config'Junio C Hamano2015-08-031-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | log: add "log.follow" configuration variableDavid Turner2015-07-091-0/+6
* | | | | | | | | | Merge branch 'jk/cat-file-batch-all'Junio C Hamano2015-08-031-0/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cat-file: sort and de-dup output of --batch-all-objectsjk/cat-file-batch-allJeff King2015-06-261-2/+1
| * | | | | | | | | | cat-file: add --batch-all-objects optionJeff King2015-06-221-0/+8
| * | | | | | | | | | cat-file: add --buffer optionJeff King2015-06-221-0/+7
* | | | | | | | | | | Merge branch 'js/fsck-opt'Junio C Hamano2015-08-032-1/+47
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fsck: support ignoring objects in `git fsck` via fsck.skiplistjs/fsck-optJohannes Schindelin2015-06-231-0/+8
| * | | | | | | | | | | fsck: git receive-pack: support excluding objects from fsck'ingJohannes Schindelin2015-06-231-0/+8
| * | | | | | | | | | | fsck: introduce `git fsck --connectivity-only`Johannes Schindelin2015-06-231-1/+6
| * | | | | | | | | | | fsck: support demoting errors to warningsJohannes Schindelin2015-06-231-0/+11
| * | | | | | | | | | | fsck: document the new receive.fsck.<msg-id> optionsJohannes Schindelin2015-06-231-0/+14
* | | | | | | | | | | | Merge branch 'pt/pull-builtin'Junio C Hamano2015-08-032-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | argv-array: implement argv_array_pushv()Paul Tan2015-06-151-0/+3
| * | | | | | | | | | | | parse-options-cb: implement parse_opt_passthru_argv()Paul Tan2015-06-151-0/+6
| * | | | | | | | | | | | parse-options-cb: implement parse_opt_passthru()Paul Tan2015-06-151-0/+7
* | | | | | | | | | | | | Merge branch 'jk/pkt-log-pack'Junio C Hamano2015-08-031-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pkt-line: support tracing verbatim pack contentsjk/pkt-log-packJeff King2015-06-161-1/+12
* | | | | | | | | | | | | | Merge branch 'mr/rebase-i-customize-insn-sheet'Junio C Hamano2015-08-032-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-rebase--interactive.sh: add config option for custom instruction formatmr/rebase-i-customize-insn-sheetMichael Rappazzo2015-06-152-0/+12
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |