Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jg/cguide-we-cannot-count' | Junio C Hamano | 2015-04-14 | 1 | -1/+1 |
|\ | |||||
| * | CodingGuidelines: update 'rough' rule countjg/cguide-we-cannot-count | Julian Gindi | 2015-04-14 | 1 | -1/+1 |
* | | Git 2.4.0-rc1v2.4.0-rc1 | Junio C Hamano | 2015-04-02 | 1 | -2/+3 |
* | | Sync with 2.3.5 | Junio C Hamano | 2015-03-31 | 3 | -2/+8 |
|\ \ | |||||
| * | | Git 2.3.5v2.3.5 | Junio C Hamano | 2015-03-31 | 2 | -1/+5 |
| * | | Merge branch 'ss/pull-rebase-preserve' into maint | Junio C Hamano | 2015-03-31 | 2 | -4/+5 |
| |\ \ | |||||
| | * | | docs: clarify what git-rebase's "-p" / "--preserve-merges" doesss/pull-rebase-preserve | Sebastian Schuberth | 2015-03-30 | 1 | -1/+3 |
| * | | | Merge branch 'ph/push-doc-cas' into maint | Junio C Hamano | 2015-03-31 | 1 | -8/+6 |
| |\ \ \ | |||||
* | \ \ \ | Sync with maint | Junio C Hamano | 2015-03-28 | 2 | -1/+42 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Prepare for 2.3.5 | Junio C Hamano | 2015-03-28 | 1 | -0/+41 |
| * | | | | Merge branch 'nd/doc-git-index-version' into maint | Junio C Hamano | 2015-03-28 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/submitting-patches-mention-send-email' into maint | Junio C Hamano | 2015-03-28 | 1 | -0/+5 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/prune-with-corrupt-refs' into maint | Junio C Hamano | 2015-03-28 | 1 | -0/+11 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | 2.3.2 release notes: typofix | Thomas Ackermann | 2015-03-28 | 1 | -1/+1 |
* | | | | | | | | RelNotes: minor doc updates | Junio C Hamano | 2015-03-28 | 1 | -1/+3 |
* | | | | | | | | Merge branch 'ph/push-doc-cas' | Junio C Hamano | 2015-03-28 | 1 | -8/+6 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | git-push.txt: clean up force-with-lease wordingph/push-doc-cas | Phil Hord | 2015-03-26 | 1 | -8/+6 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'ss/pull-rebase-preserve' | Junio C Hamano | 2015-03-28 | 1 | -3/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | docs: clarify "preserve" option wording for git-pull | Sebastian Schuberth | 2015-03-26 | 1 | -3/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jn/doc-api-errors' | Junio C Hamano | 2015-03-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | api-error-handling doc: typofixjn/doc-api-errors | Thomas Ackermann | 2015-03-28 | 1 | -1/+1 |
* | | | | | | | Git 2.4.0-rc0v2.4.0-rc0 | Junio C Hamano | 2015-03-26 | 1 | -0/+7 |
* | | | | | | | Getting ready for -rc0 | Junio C Hamano | 2015-03-25 | 1 | -0/+52 |
* | | | | | | | Merge branch 'nd/doc-git-index-version' | Junio C Hamano | 2015-03-25 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | git.txt: list index versions in plain Englishnd/doc-git-index-version | Nguyễn Thái Ngọc Duy | 2015-03-24 | 1 | -1/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/prune-with-corrupt-refs' | Junio C Hamano | 2015-03-25 | 1 | -0/+11 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | refs: introduce a "ref paranoia" flag | Jeff King | 2015-03-20 | 1 | -0/+11 |
* | | | | | | Merge branch 'jc/submitting-patches-mention-send-email' | Junio C Hamano | 2015-03-25 | 1 | -0/+5 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | SubmittingPatches: encourage users to use format-patch and send-emailjc/submitting-patches-mention-send-email | Junio C Hamano | 2015-03-15 | 1 | -0/+5 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'dj/log-graph-with-no-walk' | Junio C Hamano | 2015-03-25 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | revision: forbid combining --graph and --no-walkdj/log-graph-with-no-walk | Dongcan Jiang | 2015-03-19 | 1 | -0/+2 |
* | | | | | | Merge branch 'kd/rev-list-bisect-first-parent' | Junio C Hamano | 2015-03-25 | 1 | -3/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rev-list: refuse --first-parent combined with --bisectkd/rev-list-bisect-first-parent | Kevin Daudt | 2015-03-19 | 1 | -3/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Sync with v2.3.4 | Junio C Hamano | 2015-03-23 | 2 | -1/+34 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Git 2.3.4v2.3.4 | Junio C Hamano | 2015-03-23 | 2 | -1/+34 |
| * | | | | | Merge branch 'mg/doc-status-color-slot' into maint | Junio C Hamano | 2015-03-23 | 1 | -2/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/decorate-leaky-separator-color' into maint | Junio C Hamano | 2015-03-23 | 1 | -49/+75 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'km/imap-send-libcurl-options' into maint | Junio C Hamano | 2015-03-23 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Post 2.3 cycle (batch #12) | Junio C Hamano | 2015-03-23 | 1 | -15/+46 |
* | | | | | | | | Merge branch 'jk/push-config' | Junio C Hamano | 2015-03-23 | 2 | -1/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | push: allow --follow-tags to be set by config push.followTagsjk/push-config | Dave Olszewski | 2015-03-14 | 2 | -1/+10 |
* | | | | | | | | | Merge branch 'nd/config-doc-camelCase' | Junio C Hamano | 2015-03-23 | 37 | -212/+212 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCase | Nguyễn Thái Ngọc Duy | 2015-03-13 | 37 | -212/+212 |
* | | | | | | | | | | Post 2.3 cycle (batch #11) | Junio C Hamano | 2015-03-20 | 1 | -0/+64 |
* | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color' | Junio C Hamano | 2015-03-20 | 1 | -49/+73 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | log --decorate: do not leak "commit" color into the next itemjc/decorate-leaky-separator-color | Junio C Hamano | 2015-03-04 | 1 | -0/+7 |
| * | | | | | | | | | Documentation/config.txt: simplify boolean description in the syntax section | Junio C Hamano | 2015-03-04 | 1 | -2/+2 |
| * | | | | | | | | | Documentation/config.txt: describe 'color' value type in the "Values" section | Junio C Hamano | 2015-03-04 | 1 | -16/+13 |
| * | | | | | | | | | Documentation/config.txt: have a separate "Values" section | Junio C Hamano | 2015-03-04 | 1 | -8/+31 |
| * | | | | | | | | | Documentation/config.txt: describe the structure first and then meaning | Junio C Hamano | 2015-03-04 | 1 | -16/+15 |