Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-am: add am.threeWay config variablerl/am-3way-config | Remi Lespinet | 2015-06-04 | 4 | -2/+41 |
* | t4150-am: refactor am -3 tests | Remi Lespinet | 2015-06-04 | 1 | -15/+11 |
* | git-am.sh: fix initialization of the threeway variable | Remi Lespinet | 2015-06-04 | 1 | -0/+1 |
* | Git 2.4v2.4.0 | Junio C Hamano | 2015-04-30 | 2 | -1/+6 |
* | Merge branch 'mh/multimail-renewal' | Junio C Hamano | 2015-04-28 | 2 | -24/+25 |
|\ | |||||
| * | Update git-multimail to version 1.0.2mh/multimail-renewal | Michael Haggerty | 2015-04-28 | 2 | -24/+25 |
* | | Merge branch 'mg/show-notes-doc' | Junio C Hamano | 2015-04-28 | 1 | -2/+2 |
|\ \ | |||||
| * | | rev-list-options.txt: complete sentence about notes matchingmg/show-notes-doc | Michael J Gruber | 2015-04-17 | 1 | -2/+2 |
* | | | Merge branch 'nd/versioncmp-prereleases' | Junio C Hamano | 2015-04-28 | 1 | -4/+7 |
|\ \ \ | |||||
| * | | | git tag: mention versionsort.prereleaseSuffix in manpagend/versioncmp-prereleases | Michael Haggerty | 2015-04-23 | 1 | -4/+7 |
* | | | | Merge branch 'mg/status-v-v' | Junio C Hamano | 2015-04-28 | 1 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | status: document the -v/--verbose optionmg/status-v-v | Michael Haggerty | 2015-04-23 | 1 | -0/+8 |
* | | | | | Sync with 2.3.7 | Junio C Hamano | 2015-04-27 | 2 | -1/+23 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Git 2.3.7v2.3.7 | Junio C Hamano | 2015-04-27 | 4 | -3/+25 |
| * | | | | Merge branch 'tb/connect-ipv6-parse-fix' into maint | Junio C Hamano | 2015-04-27 | 3 | -16/+24 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ma/bash-completion-leaking-x' into maint | Junio C Hamano | 2015-04-27 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/push-cert' into maint | Junio C Hamano | 2015-04-27 | 1 | -0/+23 |
| |\ \ \ \ \ \ | |||||
* | | | | | | | | RelNotes: wordsmithing | Michael Haggerty | 2015-04-23 | 1 | -164/+172 |
* | | | | | | | | RelNotes: refer to the rebase -i "todo list", not "insn sheet" | Michael Haggerty | 2015-04-23 | 1 | -2/+2 |
* | | | | | | | | RelNotes: correct name of versionsort.prereleaseSuffix | Michael Haggerty | 2015-04-23 | 1 | -2/+2 |
* | | | | | | | | Git 2.4.0-rc3v2.4.0-rc3 | Junio C Hamano | 2015-04-22 | 1 | -1/+1 |
* | | | | | | | | Sync with maint | Junio C Hamano | 2015-04-21 | 2 | -1/+15 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Git 2.3.6v2.3.6 | Junio C Hamano | 2015-04-21 | 4 | -3/+17 |
| * | | | | | | | Merge branch 'jk/colors' into maint | Junio C Hamano | 2015-04-21 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/test-annoyances' into maint | Junio C Hamano | 2015-04-21 | 5 | -15/+24 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'pt/enter-repo-comment-fix' into maint | Junio C Hamano | 2015-04-21 | 1 | -8/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jz/gitweb-conf-doc-fix' into maint | Junio C Hamano | 2015-04-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/cherry-pick-docfix' into maint | Junio C Hamano | 2015-04-21 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'iu/fix-parse-options-h-comment' into maint | Junio C Hamano | 2015-04-21 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jg/cguide-we-cannot-count' into maint | Junio C Hamano | 2015-04-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/pack-corruption-post-mortem' into maint | Junio C Hamano | 2015-04-21 | 1 | -0/+237 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint | Junio C Hamano | 2015-04-21 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | RelNotes: "merge --quiet" change has been reverted | Junio C Hamano | 2015-04-21 | 1 | -4/+0 |
* | | | | | | | | | | | | | | | | | Hopefully the last batch for 2.4 | Junio C Hamano | 2015-04-20 | 1 | -1/+18 |
* | | | | | | | | | | | | | | | | | Merge branch 'ps/grep-help-all-callback-arg' | Junio C Hamano | 2015-04-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | grep: correctly initialize help-all optionps/grep-help-all-callback-arg | Patrick Steinhardt | 2015-04-12 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge branch 'tb/connect-ipv6-parse-fix' | Junio C Hamano | 2015-04-20 | 3 | -16/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | connect.c: ignore extra colon after hostnametb/connect-ipv6-parse-fix | Torsten Bögershausen | 2015-04-08 | 3 | -16/+24 |
* | | | | | | | | | | | | | | | | | | Merge branch 'va/fix-git-p4-tests' | Junio C Hamano | 2015-04-20 | 1 | -12/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | t9814: guarantee only one source exists in git-p4 copy tests | Vitor Antunes | 2015-04-12 | 1 | -15/+31 |
| * | | | | | | | | | | | | | | | | | | git-p4: fix copy detection test | Vitor Antunes | 2015-03-28 | 1 | -1/+4 |
| * | | | | | | | | | | | | | | | | | | t9814: fix broken shell syntax in git-p4 rename test | Vitor Antunes | 2015-03-28 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/push-cert' | Junio C Hamano | 2015-04-20 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | push --signed: tighten what the receiving end can ask to signjc/push-cert | Junio C Hamano | 2015-04-02 | 1 | -0/+23 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ma/bash-completion-leaking-x' | Junio C Hamano | 2015-04-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | completion: fix global bash variable leak on __gitcompappendma/bash-completion-leaking-x | Márcio Almada | 2015-04-12 | 1 | -1/+1 |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui | Junio C Hamano | 2015-04-18 | 10 | -1773/+4690 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | git-gui: set version 0.20gitgui-0.20.0 | Pat Thoyts | 2015-04-18 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | git-gui: sv.po: Update Swedish translation (547t0f0u) | Peter Krefting | 2015-04-18 | 1 | -1431/+1562 |
| * | | | | | | | | | | | | | | | | | | git-gui i18n: Updated Bulgarian translation (547t,0f,0u) | Alexander Shopov | 2015-04-18 | 1 | -1498/+1528 |