Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'la/tag-force-signing-annotated-tags' | Junio C Hamano | 2016-04-06 | 1 | -0/+5 |
|\ | |||||
| * | tag: add the option to force signing of annotated tags | Laurent Arnoud | 2016-03-22 | 1 | -0/+5 |
* | | Merge branch 'sb/submodule-parallel-update' | Junio C Hamano | 2016-04-06 | 1 | -0/+6 |
|\ \ | |||||
| * | | fetching submodules: respect `submodule.fetchJobs` config option | Stefan Beller | 2016-03-01 | 1 | -0/+6 |
* | | | Merge branch 'jk/add-i-highlight' | Junio C Hamano | 2016-04-03 | 1 | -0/+8 |
|\ \ \ | |||||
| * | | | add--interactive: allow custom diff highlighting programs | Jeff King | 2016-02-28 | 1 | -0/+8 |
| | |/ | |/| | |||||
* / | | credential: let empty credential specs reset helper list | Jeff King | 2016-02-26 | 1 | -2/+3 |
|/ / | |||||
* | | Merge branch 'ce/https-public-key-pinning' | Junio C Hamano | 2016-02-24 | 1 | -0/+8 |
|\ \ | |||||
| * | | http: implement public key pinning | Christoph Egger | 2016-02-16 | 1 | -0/+8 |
* | | | Merge branch 'bc/http-empty-auth' | Junio C Hamano | 2016-02-24 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | http: add option to try authentication without username | brian m. carlson | 2016-02-15 | 1 | -0/+6 |
| |/ / | |||||
* | | | Merge branch 'da/user-useconfigonly' | Junio C Hamano | 2016-02-17 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | ident: add user.useConfigOnly boolean for when ident shouldn't be guessed | Dan Aloni | 2016-02-08 | 1 | -0/+10 |
| |/ / | |||||
* | | | Merge branch 'jk/drop-rsync-transport' | Junio C Hamano | 2016-02-17 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | transport: drop support for git-over-rsync | Jeff King | 2016-02-01 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'cc/untracked' | Junio C Hamano | 2016-02-10 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | config: add core.untrackedCache | Christian Couder | 2016-01-27 | 1 | -0/+9 |
| | |/ | |/| | |||||
* | | | Merge branch 'kf/http-proxy-auth-methods' | Junio C Hamano | 2016-02-03 | 1 | -3/+33 |
|\ \ \ | |||||
| * | | | http: use credential API to handle proxy authentication | Knut Franke | 2016-01-26 | 1 | -3/+7 |
| * | | | http: allow selection of proxy authentication method | Knut Franke | 2016-01-26 | 1 | -0/+26 |
| | |/ | |/| | |||||
* | | | Merge branch 'ak/format-patch-odir-config' | Junio C Hamano | 2016-01-27 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | format-patch: introduce format.outputDirectory configuration | Alexander Kuleshov | 2016-01-13 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge branch 'js/pull-rebase-i' | Junio C Hamano | 2016-01-27 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | pull: allow interactive rebase with --rebase=interactive | Johannes Schindelin | 2016-01-13 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge branch 'tg/grep-no-index-fallback' | Junio C Hamano | 2016-01-20 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | builtin/grep: add grep.fallbackToNoIndex config | Thomas Gummerer | 2016-01-12 | 1 | -0/+4 |
* | | | | Merge branch 'vl/grep-configurable-threads' | Junio C Hamano | 2016-01-13 | 1 | -0/+4 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | grep: add --threads=<num> option and grep.threads configuration | Victor Leschuk | 2015-12-16 | 1 | -0/+4 |
* | | | | Merge branch 'mc/push-recurse-submodules-config' | Junio C Hamano | 2015-12-21 | 1 | -0/+14 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | push: add recurseSubmodules config option | Mike Crowe | 2015-11-20 | 1 | -0/+14 |
* | | | | credential-cache: new option to ignore sighup | Noam Postavsky | 2015-11-20 | 1 | -0/+3 |
|/ / / | |||||
* | | | hideRefs: add support for matching full refs | Lukas Fleischer | 2015-11-05 | 1 | -1/+2 |
* | | | config.txt: document the semantics of hideRefs with namespaces | Lukas Fleischer | 2015-11-05 | 1 | -0/+8 |
|/ / | |||||
* | | Merge branch 'dt/log-follow-config' | Junio C Hamano | 2015-10-16 | 1 | -0/+6 |
|\ \ | |||||
| * | | log: Update log.follow doc and add to config.txt | Eric N. Vander Weele | 2015-10-07 | 1 | -0/+6 |
* | | | Merge branch 'jk/date-local' | Junio C Hamano | 2015-10-05 | 1 | -3/+1 |
|\ \ \ | |||||
| * | | | Documentation/config: don't list date formats | John Keeping | 2015-09-04 | 1 | -3/+1 |
| |/ / | |||||
* | | | Merge branch 'nk/stash-show-config' | Junio C Hamano | 2015-10-05 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | stash: allow "stash show" diff output configurable | Namhyung Kim | 2015-08-31 | 1 | -0/+10 |
* | | | | Merge branch 'as/config-doc-markup-fix' | Junio C Hamano | 2015-09-17 | 1 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | Documentation/config: fix formatting for branch.*.rebase and pull.rebase | Andreas Schwab | 2015-09-13 | 1 | -6/+6 |
* | | | | | Merge branch 'db/push-sign-if-asked' | Junio C Hamano | 2015-09-01 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | push: add a config option push.gpgSign for default signed pushes | Dave Borowitz | 2015-08-19 | 1 | -0/+8 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'jk/color-diff-plain-is-context' into maint | Junio C Hamano | 2015-06-25 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'pt/pull-ff-vs-merge-ff' into maint | Junio C Hamano | 2015-06-05 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/asciidoc-markup-fix' into maint | Junio C Hamano | 2015-06-05 | 1 | -5/+5 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'jk/notes-merge-config' | Junio C Hamano | 2015-09-01 | 1 | -2/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy option | Jacob Keller | 2015-08-18 | 1 | -0/+6 |
| * | | | | | | | | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 2015-08-18 | 1 | -0/+6 |
| * | | | | | | | | notes: document cat_sort_uniq rewriteMode | Jacob Keller | 2015-08-18 | 1 | -2/+2 |
| | |_|_|_|_|/ / | |/| | | | | | |