Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with maint | Junio C Hamano | 2015-08-03 | 2 | -2/+24 |
|\ | |||||
| * | Sync with 2.4.8 | Junio C Hamano | 2015-08-03 | 2 | -2/+24 |
| |\ | |||||
| | * | Git 2.4.8v2.4.8 | Junio C Hamano | 2015-08-03 | 2 | -1/+23 |
* | | | First batch for 2.6 | Junio C Hamano | 2015-08-03 | 1 | -0/+154 |
* | | | 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 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | refs: loosen restriction on wildcard "*" refspecsjk/refspec-parse-wildcard | Jacob Keller | 2015-07-27 | 1 | -2/+2 |
* | | | | | Merge branch 'zb/userdiff-fountain' | Junio C Hamano | 2015-08-03 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | userdiff: add support for Fountain documentszb/userdiff-fountain | Zoë Blade | 2015-07-23 | 1 | -0/+2 |
* | | | | | | Merge branch 'dt/refs-backend-preamble' | Junio C Hamano | 2015-08-03 | 3 | -2/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | update-ref and tag: add --create-reflog arg | David Turner | 2015-07-21 | 2 | -2/+8 |
| * | | | | | | git-reflog: add exists command | David Turner | 2015-07-21 | 1 | -0/+4 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/date-mode-format' | Junio C Hamano | 2015-08-03 | 1 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | introduce "format" date-mode | Jeff King | 2015-06-29 | 1 | -0/+5 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'se/doc-checkout-ours-theirs' | Junio C Hamano | 2015-08-03 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | checkout: document subtlety around --ours/--theirsse/doc-checkout-ours-theirs | Simon A. Eugster | 2015-07-12 | 1 | -0/+15 |
* | | | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string' | Junio C Hamano | 2015-08-03 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-string | Ilya Bobyr | 2015-07-15 | 1 | -2/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'kn/tag-doc-fix' | Junio C Hamano | 2015-08-03 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation/tag: remove double occurance of "<pattern>"kn/tag-doc-fix | Karthik Nayak | 2015-07-10 | 1 | -1/+0 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mh/fast-import-get-mark' | Junio C Hamano | 2015-08-03 | 1 | -6/+33 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fast-import: add a get-mark commandmh/fast-import-get-mark | Michael Haggerty | 2015-07-01 | 1 | -6/+33 |
* | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-08-03 | 2 | -0/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git rebase -i: warn about removed commits | Galan Rémi | 2015-06-30 | 2 | -0/+17 |
| * | | | | | | | | git-rebase -i: add command "drop" to remove a commit | Galan Rémi | 2015-06-30 | 1 | -0/+3 |
* | | | | | | | | | Merge branch 'dt/log-follow-config' | Junio C Hamano | 2015-08-03 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | log: add "log.follow" configuration variable | David Turner | 2015-07-09 | 1 | -0/+6 |
* | | | | | | | | | | Merge branch 'jk/cat-file-batch-all' | Junio C Hamano | 2015-08-03 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | cat-file: sort and de-dup output of --batch-all-objectsjk/cat-file-batch-all | Jeff King | 2015-06-26 | 1 | -2/+1 |
| * | | | | | | | | | | cat-file: add --batch-all-objects option | Jeff King | 2015-06-22 | 1 | -0/+8 |
| * | | | | | | | | | | cat-file: add --buffer option | Jeff King | 2015-06-22 | 1 | -0/+7 |
* | | | | | | | | | | | Merge branch 'js/fsck-opt' | Junio C Hamano | 2015-08-03 | 2 | -1/+47 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fsck: support ignoring objects in `git fsck` via fsck.skiplistjs/fsck-opt | Johannes Schindelin | 2015-06-23 | 1 | -0/+8 |
| * | | | | | | | | | | | fsck: git receive-pack: support excluding objects from fsck'ing | Johannes Schindelin | 2015-06-23 | 1 | -0/+8 |
| * | | | | | | | | | | | fsck: introduce `git fsck --connectivity-only` | Johannes Schindelin | 2015-06-23 | 1 | -1/+6 |
| * | | | | | | | | | | | fsck: support demoting errors to warnings | Johannes Schindelin | 2015-06-23 | 1 | -0/+11 |
| * | | | | | | | | | | | fsck: document the new receive.fsck.<msg-id> options | Johannes Schindelin | 2015-06-23 | 1 | -0/+14 |
* | | | | | | | | | | | | Merge branch 'pt/pull-builtin' | Junio C Hamano | 2015-08-03 | 2 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | argv-array: implement argv_array_pushv() | Paul Tan | 2015-06-15 | 1 | -0/+3 |
| * | | | | | | | | | | | | parse-options-cb: implement parse_opt_passthru_argv() | Paul Tan | 2015-06-15 | 1 | -0/+6 |
| * | | | | | | | | | | | | parse-options-cb: implement parse_opt_passthru() | Paul Tan | 2015-06-15 | 1 | -0/+7 |
* | | | | | | | | | | | | | Merge branch 'jk/pkt-log-pack' | Junio C Hamano | 2015-08-03 | 1 | -1/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | pkt-line: support tracing verbatim pack contentsjk/pkt-log-pack | Jeff King | 2015-06-16 | 1 | -1/+12 |
* | | | | | | | | | | | | | | Merge branch 'mr/rebase-i-customize-insn-sheet' | Junio C Hamano | 2015-08-03 | 2 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | git-rebase--interactive.sh: add config option for custom instruction formatmr/rebase-i-customize-insn-sheet | Michael Rappazzo | 2015-06-15 | 2 | -0/+12 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | |