summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* test-path-utils: use xsnprintf in favor of strcpyjk/test-path-utils-xsnprintfJeff King2016-02-081-1/+1
* 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
* | | | | | | | Merge branch 'jk/notes-merge-from-anywhere'Junio C Hamano2016-02-034-12/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | notes: allow merging from arbitrary referencesjk/notes-merge-from-anywhereJacob Keller2016-01-174-12/+29
* | | | | | | | | Merge branch 'jc/peace-with-crlf'Junio C Hamano2016-02-0313-20/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-sha1-array: read command stream with strbuf_getline()jc/peace-with-crlfJunio C Hamano2016-01-151-1/+1
| * | | | | | | | | grep: read -f file with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | send-pack: read list of refs with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | column: read lines with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | cat-file: read batch stream with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | transport-helper: read helper response with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | clone/sha1_file: read info/alternates with strbuf_getline()Junio C Hamano2016-01-152-2/+2
| * | | | | | | | | remote.c: read $GIT_DIR/remotes/* with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | ident.c: read /etc/mailname with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | rev-parse: read parseopt spec with strbuf_getline()Junio C Hamano2016-01-151-2/+2
| * | | | | | | | | revision: read --stdin with strbuf_getline()Junio C Hamano2016-01-151-7/+2
| * | | | | | | | | hash-object: read --stdin-paths with strbuf_getline()Junio C Hamano2016-01-151-1/+1