summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* remote: use remote_is_configured() for add and renametg/git-remoteThomas Gummerer2016-02-162-5/+17
* remote: actually check if remote exitsThomas Gummerer2016-02-162-2/+20
* remote: simplify remote_is_configured()Thomas Gummerer2016-02-164-21/+12
* remote: use parse_config_keyThomas Gummerer2016-02-161-37/+32
* Merge branch 'kf/http-proxy-auth-methods'Junio C Hamano2016-02-036-6/+181
|\
| * http: use credential API to handle proxy authenticationkf/http-proxy-auth-methodsKnut Franke2016-01-263-3/+85
| * http: allow selection of proxy authentication methodKnut Franke2016-01-265-3/+96
* | Merge branch 'jk/ref-cache-non-repository-optim'Junio C Hamano2016-02-036-40/+80
|\ \
| * | resolve_gitlink_ref: ignore non-repository pathsjk/ref-cache-non-repository-optimJeff King2016-01-253-14/+43
| * | clean: make is_git_repository a public functionJeff King2016-01-253-26/+37
* | | Merge branch 'ls/travis-prove-order'Junio C Hamano2016-02-031-1/+9
|\ \ \
| * | | travis-ci: explicity use container-based infrastructurels/travis-prove-orderLars Schneider2016-01-261-0/+2
| * | | travis-ci: run previously failed tests first, then slowest to fastestLars Schneider2016-01-261-1/+7
| | |/ | |/|
* | | Merge branch 'dt/unpack-compare-entry-optim'Junio C Hamano2016-02-033-3/+56
|\ \ \
| * | | unpack-trees: fix accidentally quadratic behaviordt/unpack-compare-entry-optimDavid Turner2016-01-221-1/+12
| * | | do_compare_entry: use already-computed pathDavid Turner2016-01-053-2/+44
* | | | Merge branch 'js/dirname-basename'Junio C Hamano2016-02-037-24/+225
|\ \ \ \
| * | | | mingw: avoid linking to the C library's isalpha()js/dirname-basenameJohannes Sixt2016-01-252-6/+8
| * | | | t0060: loosen overly strict expectationsJohannes Schindelin2016-01-151-57/+21
| * | | | t0060: verify that basename() and dirname() work as expectedJohannes Schindelin2016-01-122-0/+169
| * | | | compat/basename.c: provide a dirname() compatibility functionJohannes Schindelin2016-01-122-0/+46
| * | | | compat/basename: make basename() conform to POSIXJohannes Schindelin2016-01-121-3/+17
| * | | | Refactor skipping DOS drive prefixesJohannes Schindelin2016-01-125-22/+28
* | | | | Merge branch 'pw/completion-stash'Junio C Hamano2016-02-031-3/+14
|\ \ \ \ \
| * | | | | completion: update completion arguments for stashPaul Wagland2016-01-261-3/+14
| | |_|_|/ | |/| | |
* | | | | Merge branch 'pw/completion-show-branch'Junio C Hamano2016-02-031-1/+1
|\ \ \ \ \
| * | | | | completion: complete show-branch "--date-order"pw/completion-show-branchPaul Wagland2016-01-251-1/+1
| |/ / / /
* | | | | Merge branch 'jk/completion-rebase'Junio C Hamano2016-02-031-2/+6
|\ \ \ \ \
| * | | | | completion: add missing git-rebase optionsjk/completion-rebaseJohn Keeping2016-01-251-2/+6
| |/ / / /
* | | | | Merge branch 'nd/diff-with-path-params'Junio C Hamano2016-02-037-12/+25
|\ \ \ \ \
| * | | | | diff: make -O and --output work in subdirectorynd/diff-with-path-paramsDuy Nguyen2016-01-216-8/+21
| * | | | | diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy2016-01-213-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'lv/add-doc-working-tree'Junio C Hamano2016-02-031-1/+1
|\ \ \ \ \
| * | | | | git-add doc: do not say working directory when you mean working treelv/add-doc-working-treeLars Vogel2016-01-211-1/+1
* | | | | | Merge branch 'dw/subtree-split-do-not-drop-merge'Junio C Hamano2016-02-032-2/+70
|\ \ \ \ \ \
| * | | | | | contrib/subtree: fix "subtree split" skipped-merge bugdw/subtree-split-do-not-drop-mergeDave Ware2016-01-202-2/+70
* | | | | | | Merge branch 'tb/complete-word-diff-regex'Junio C Hamano2016-02-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | completion: complete "diff --word-diff-regex="tb/complete-word-diff-regexThomas Braun2016-01-201-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mk/asciidoctor-bq-workaround'Junio C Hamano2016-02-031-10/+10
|\ \ \ \ \ \ \
| * | | | | | | Documentation: remove unnecessary backslashesmk/asciidoctor-bq-workaroundMatthew Kraai2016-01-201-10/+10
* | | | | | | | Merge branch 'dg/subtree-test'Junio C Hamano2016-02-031-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | contrib/subtree: Make testing easierdg/subtree-testDavid A. Greene2016-01-191-1/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'tg/ls-remote-symref'Junio C Hamano2016-02-033-56/+97
|\ \ \ \ \ \ \ \
| * | | | | | | | ls-remote: add support for showing symrefstg/ls-remote-symrefThomas Gummerer2016-01-193-3/+61
| * | | | | | | | ls-remote: use parse-options apiThomas Gummerer2016-01-191-53/+29
| * | | | | | | | ls-remote: fix synopsisThomas Gummerer2016-01-191-1/+1
| * | | | | | | | ls-remote: document --refs optionThomas Gummerer2016-01-192-2/+5
| * | | | | | | | ls-remote: document --quiet optionThomas Gummerer2016-01-191-1/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'tb/ls-files-eol'Junio C Hamano2016-02-035-49/+237
|\ \ \ \ \ \ \ \
| * | | | | | | | ls-files: add eol diagnosticstb/ls-files-eolTorsten Bögershausen2016-01-185-49/+237