Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jl/nor-or-nand-and' | Junio C Hamano | 2014-04-08 | 25 | -44/+43 |
|\ | |||||
| * | Documentation: fix misuses of "nor" | Justin Lebar | 2014-03-31 | 25 | -44/+43 |
* | | Merge branch 'mr/opt-set-ptr' | Junio C Hamano | 2014-04-08 | 1 | -4/+0 |
|\ \ | |||||
| * | | parse-options: remove unused OPT_SET_PTRmr/opt-set-ptr | Marat Radchenko | 2014-03-31 | 1 | -4/+0 |
* | | | Merge branch 'ib/rev-parse-parseopt-argh' | Junio C Hamano | 2014-04-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | rev-parse: fix typo in example on manpageib/rev-parse-parseopt-argh | René Scharfe | 2014-04-01 | 1 | -1/+1 |
* | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' | Junio C Hamano | 2014-04-08 | 7 | -19/+23 |
|\ \ \ \ | |||||
| * | | | | update-index: teach --cacheinfo a new syntax "mode,sha1,path" | Junio C Hamano | 2014-03-24 | 1 | -2/+6 |
| * | | | | parse-options: multi-word argh should use dash to separate words | Junio C Hamano | 2014-03-24 | 6 | -17/+17 |
| |/ / / | |||||
* | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-04-03 | 1 | -0/+25 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2014-04-03 | 1 | -0/+38 |
|\ \ \ \ | |||||
| * | | | | Start preparing for 1.9.1 | Junio C Hamano | 2014-04-03 | 1 | -0/+38 |
| * | | | | Merge branch 'rr/doc-merge-strategies' into maint | Junio C Hamano | 2014-04-03 | 1 | -2/+2 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'nd/gc-aggressive' | Junio C Hamano | 2014-04-03 | 2 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | gc --aggressive: make --depth configurable | Nguyễn Thái Ngọc Duy | 2014-03-31 | 2 | -0/+8 |
* | | | | | | Merge branch 'nd/log-show-linear-break' | Junio C Hamano | 2014-04-03 | 1 | -0/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | log: add --show-linear-break to help see non-linear historynd/log-show-linear-break | Nguyễn Thái Ngọc Duy | 2014-03-25 | 1 | -0/+7 |
* | | | | | | | Revert part of 384364b (Start preparing for Git 2.0, 2014-03-07) | Junio C Hamano | 2014-04-02 | 1 | -5/+0 |
* | | | | | | | Revert "submodule: explicit local branch creation in module_clone" | Junio C Hamano | 2014-04-02 | 2 | -30/+8 |
* | | | | | | | Revert "Merge branch 'wt/doc-submodule-name-path-confusion-2'" | Junio C Hamano | 2014-04-01 | 1 | -1/+1 |
* | | | | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-03-31 | 1 | -0/+13 |
* | | | | | | | Merge branch 'wt/doc-submodule-name-path-confusion-2' | Junio C Hamano | 2014-03-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | doc: submodule.*.branch config is keyed by namewt/doc-submodule-name-path-confusion-2 | W. Trevor King | 2014-03-27 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'wt/doc-submodule-name-path-confusion-1' | Junio C Hamano | 2014-03-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: submodule.* config are keyed by submodule nameswt/doc-submodule-name-path-confusion-1 | W. Trevor King | 2014-03-27 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'ib/rev-parse-parseopt-argh' | Junio C Hamano | 2014-03-31 | 1 | -2/+32 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | rev-parse --parseopt: option argument name hints | Ilya Bobyr | 2014-03-23 | 1 | -2/+32 |
* | | | | | | | | | Merge branch 'dw/doc-status-no-longer-shows-pound-prefix' | Junio C Hamano | 2014-03-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc: status, remove leftover statement about '#' prefixdw/doc-status-no-longer-shows-pound-prefix | Dirk Wallenstein | 2014-03-21 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'ca/doc-config-third-party' | Junio C Hamano | 2014-03-31 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | config.txt: third-party tools may and do use their own variablesca/doc-config-third-party | Chris Angelico | 2014-03-21 | 1 | -2/+7 |
* | | | | | | | | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-03-28 | 1 | -0/+27 |
* | | | | | | | | | | | Merge branch 'ah/doc-gitk-config' | Junio C Hamano | 2014-03-28 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Documentation/gitk: document the location of the configulation fileah/doc-gitk-config | Astril Hayato | 2014-03-20 | 1 | -2/+8 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-03-25 | 1 | -0/+29 |
* | | | | | | | | | | | Merge branch 'rr/doc-merge-strategies' | Junio C Hamano | 2014-03-25 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Documentation/merge-strategies: avoid hyphenated commandsrr/doc-merge-strategies | Ramkumar Ramachandra | 2014-03-17 | 1 | -2/+2 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'nd/commit-editor-cleanup' | Junio C Hamano | 2014-03-25 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | commit: add --cleanup=scissorsnd/commit-editor-cleanup | Nguyễn Thái Ngọc Duy | 2014-02-25 | 1 | -1/+7 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'cp/am-patch-format-doc' | Junio C Hamano | 2014-03-25 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Documentation/git-am: typofixcp/am-patch-format-doc | Chris Packham | 2014-03-17 | 1 | -1/+1 |
| * | | | | | | | | | Documentation/git-am: Document supported --patch-format options | Chris Packham | 2014-03-11 | 1 | -3/+9 |
* | | | | | | | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-03-21 | 1 | -2/+26 |
* | | | | | | | | | | Merge branch 'lt/request-pull' | Junio C Hamano | 2014-03-21 | 1 | -6/+49 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | request-pull: documentation updates | Junio C Hamano | 2014-03-13 | 1 | -6/+49 |
* | | | | | | | | | | | Merge branch 'nd/upload-pack-shallow' | Junio C Hamano | 2014-03-21 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | upload-pack: send shallow info over stdin to pack-objectsnd/upload-pack-shallow | Nguyễn Thái Ngọc Duy | 2014-03-11 | 1 | -0/+2 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'nd/tag-version-sort' | Junio C Hamano | 2014-03-21 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | tag: support --sort=<spec>nd/tag-version-sort | Nguyễn Thái Ngọc Duy | 2014-02-27 | 1 | -0/+6 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Sync with 1.9.1 | Junio C Hamano | 2014-03-18 | 2 | -1/+61 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |