Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pull: handle --log=<n>pt/pull-log-n | Paul Tan | 2015-05-18 | 2 | -2/+19 |
* | Git 2.3.8v2.3.8 | Junio C Hamano | 2015-05-11 | 4 | -3/+26 |
* | Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3 | Junio C Hamano | 2015-05-11 | 6 | -15/+16 |
|\ | |||||
| * | log -L: improve error message on malformed argumentmm/usage-log-l-can-take-regex | Matthieu Moy | 2015-04-20 | 2 | -5/+5 |
| * | Documentation: change -L:<regex> to -L:<funcname> | Matthieu Moy | 2015-04-20 | 4 | -10/+11 |
* | | Merge branch 'jc/diff-no-index-d-f' into maint-2.3 | Junio C Hamano | 2015-05-11 | 2 | -2/+98 |
|\ \ | |||||
| * | | diff-no-index: align D/F handling with that of normal Gitjc/diff-no-index-d-f | Junio C Hamano | 2015-03-26 | 2 | -2/+33 |
| * | | diff-no-index: DWIM "diff D F" into "diff D/F F" | Junio C Hamano | 2015-03-25 | 2 | -0/+65 |
* | | | Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3 | Junio C Hamano | 2015-05-11 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | config: fix settings in default_user_config templateoh/fix-config-default-user-name-section | Ossi Herrala | 2015-04-17 | 1 | -2/+2 |
* | | | | Merge branch 'jc/epochtime-wo-tz' into maint-2.3 | Junio C Hamano | 2015-05-11 | 1 | -5/+9 |
|\ \ \ \ | |||||
| * | | | | parse_date_basic(): let the system handle DST conversionjc/epochtime-wo-tz | Junio C Hamano | 2015-04-15 | 1 | -2/+6 |
| * | | | | parse_date_basic(): return early when given a bogus timestamp | Junio C Hamano | 2015-04-15 | 1 | -3/+3 |
| | |/ / | |/| | | |||||
* | | | | 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 |
|\ \ \ \ | |||||
| * | | | | connect.c: ignore extra colon after hostnametb/connect-ipv6-parse-fix | Torsten Bögershausen | 2015-04-08 | 3 | -16/+24 |
* | | | | | Merge branch 'ma/bash-completion-leaking-x' into maint | Junio C Hamano | 2015-04-27 | 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 branch 'jc/push-cert' into maint | Junio C Hamano | 2015-04-27 | 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 |
* | | | | | | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff-highlight: do not split multibyte charactersjk/colors | Kyle J. McKay | 2015-04-04 | 1 | -2/+7 |
* | | | | | | | Merge branch 'jk/test-annoyances' into maint | Junio C Hamano | 2015-04-21 | 5 | -15/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t5551: make EXPENSIVE test cheaperjk/test-annoyances | Jeff King | 2015-03-12 | 1 | -5/+14 |
| * | | | | | | | t5541: move run_with_cmdline_limit to test-lib.sh | Jeff King | 2015-03-12 | 2 | -6/+6 |
| * | | | | | | | t: pass GIT_TRACE through Apache | Jeff King | 2015-03-12 | 2 | -0/+2 |
| * | | | | | | | t: redirect stderr GIT_TRACE to descriptor 4 | Jeff King | 2015-03-12 | 1 | -4/+1 |
| * | | | | | | | t: translate SIGINT to an exit | Jeff King | 2015-03-12 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'pt/enter-repo-comment-fix' into maint | Junio C Hamano | 2015-04-21 | 1 | -8/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | enter_repo(): fix docs to match codept/enter-repo-comment-fix | Paul Tan | 2015-03-31 | 1 | -8/+3 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jz/gitweb-conf-doc-fix' into maint | Junio C Hamano | 2015-04-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | gitweb.conf.txt: say "build-time", not "built-time"jz/gitweb-conf-doc-fix | Jérôme Zago | 2015-03-31 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jk/cherry-pick-docfix' into maint | Junio C Hamano | 2015-04-21 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | cherry-pick: fix docs describing handling of empty commitsjk/cherry-pick-docfix | Jeff King | 2015-03-30 | 1 | -1/+2 |
* | | | | | | | | | | Merge branch 'iu/fix-parse-options-h-comment' into maint | Junio C Hamano | 2015-04-21 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defvaliu/fix-parse-options-h-comment | Ivan Ukhov | 2015-03-29 | 1 | -2/+1 |
* | | | | | | | | | | | Merge branch 'jg/cguide-we-cannot-count' into maint | Junio C Hamano | 2015-04-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | CodingGuidelines: update 'rough' rule countjg/cguide-we-cannot-count | Julian Gindi | 2015-04-14 | 1 | -1/+1 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/pack-corruption-post-mortem' into maint | Junio C Hamano | 2015-04-21 | 1 | -0/+237 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | howto: document more tools for recovery corruptionjk/pack-corruption-post-mortem | Jeff King | 2015-04-01 | 1 | -0/+237 |
* | | | | | | | | | | | | Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint | Junio C Hamano | 2015-04-21 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | fast-import doc: remove suggested 16-parent limitjn/doc-fast-import-no-16-octopus-limit | Jonathan Nieder | 2015-03-31 | 1 | -4/+0 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Git 2.3.5v2.3.5 | Junio C Hamano | 2015-03-31 | 3 | -2/+6 |
* | | | | | | | | | | | 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 |
| * | | | | | | | | | | | docs: clarify "preserve" option wording for git-pull | Sebastian Schuberth | 2015-03-26 | 1 | -3/+2 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jc/report-path-error-to-dir' into maint | Junio C Hamano | 2015-03-31 | 4 | -44/+44 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | report_path_error(): move to dir.cjc/report-path-error-to-dir | Junio C Hamano | 2015-03-24 | 4 | -44/+44 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'ph/push-doc-cas' into maint | Junio C Hamano | 2015-03-31 | 1 | -8/+6 |
|\ \ \ \ \ \ \ \ \ \ \ |