summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | read_packed_refs: use a strbuf for reading linesJeff King2014-12-101-9/+11
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/always-allow-large-packets'Junio C Hamano2014-12-222-18/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | pkt-line: allow writing of LARGE_PACKET_MAX buffersjk/always-allow-large-packetsJeff King2014-12-102-18/+52
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/colors'Junio C Hamano2014-12-226-54/+250
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | parse_color: drop COLOR_BACKGROUND macroJeff King2014-12-091-5/+4
| * | | | | | | | | | | | | | | | | | | | diff-highlight: allow configurable colorsJeff King2014-11-202-13/+90
| * | | | | | | | | | | | | | | | | | | | parse_color: recognize "no$foo" to clear the $foo attributeJeff King2014-11-204-6/+20
| * | | | | | | | | | | | | | | | | | | | parse_color: support 24-bit RGB valuesJeff King2014-11-204-5/+37
| * | | | | | | | | | | | | | | | | | | | parse_color: refactor color storageJeff King2014-11-201-32/+106
| * | | | | | | | | | | | | | | | | | | | Merge branch 'jn/parse-config-slot' into jk/colorsJunio C Hamano2014-11-2013-50/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rw/apply-does-not-take-ignore-date'Junio C Hamano2014-12-221-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | git-am.txt: --ignore-date flag is not passed to git-applyrw/apply-does-not-take-ignore-dateRonald Wampler2014-12-091-1/+0
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/test-hashmap-squelch-gcc'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | test-hashmap: squelch gcc compiler warningjs/test-hashmap-squelch-gccJohannes Schindelin2014-12-091-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/fsck-tag-validation'Junio C Hamano2014-12-224-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | index-pack: terminate object buffers with NULjs/fsck-tag-validationDuy Nguyen2014-12-092-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | fsck: properly bound "invalid tag name" error messageJeff King2014-12-092-3/+8
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'po/doc-assume-unchanged'Junio C Hamano2014-12-222-14/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | gitignore.txt: do not suggest assume-unchangedpo/doc-assume-unchangedMichael J Gruber2014-12-091-4/+0
| * | | | | | | | | | | | | | | | | | | | | | | | doc: make clear --assume-unchanged's user contractPhilip Oakley2014-12-091-10/+8
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/branch-d-m-f'Junio C Hamano2014-12-222-4/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | branch: allow -f with -m and -dmg/branch-d-m-fMichael J Gruber2014-12-092-4/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | t3200-branch: test -MMichael J Gruber2014-12-041-0/+9
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/t0027-eol-conversion'Junio C Hamano2014-12-221-16/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | t0027: check the eol conversion warningstb/t0027-eol-conversionTorsten Bögershausen2014-12-051-16/+66
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/for-each-reflog-ent-reverse'Junio C Hamano2014-12-222-12/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | for_each_reflog_ent_reverse: turn leftover check into assertionjk/for-each-reflog-ent-reverseJeff King2014-12-051-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | for_each_reflog_ent_reverse: fix newlines on block boundariesJeff King2014-12-052-11/+66
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/string-list'Junio C Hamano2014-12-223-22/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | string_list: remove string_list_insert_at_index() from its APIsb/string-listStefan Beller2014-12-042-9/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | mailmap: use higher level string list functionsStefan Beller2014-12-041-13/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | string_list: document string_list_(insert,lookup)Stefan Beller2014-11-241-0/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sv/doc-stripspace'Junio C Hamano2014-12-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-stripspace: add synopsis for --comment-linessv/doc-stripspaceSlavomir Vlcek2014-12-041-0/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rt/completion-tag'Junio C Hamano2014-12-221-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | completion: add git-tag optionsrt/completion-tagRalf Thielow2014-12-041-0/+10
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored'Junio C Hamano2014-12-221-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | check-ignore: clarify treatment of tracked filesmg/doc-check-ignore-tracked-are-not-ignoredMichael J Gruber2014-12-041-0/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/credential-quit'Junio C Hamano2014-12-226-5/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | prompt: respect GIT_TERMINAL_PROMPT to disable terminal promptsjk/credential-quitJeff King2014-12-042-4/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | credential: let helpers tell us to quitJeff King2014-12-044-1/+19
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dm/compat-s-ifmt-for-zos'Junio C Hamano2014-12-225-7/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | compat: convert modes to use portable file type valuesdm/compat-s-ifmt-for-zosDavid Michael2014-12-045-7/+113
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ps/new-workdir-into-empty-directory'Junio C Hamano2014-12-221-15/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-new-workdir: don't fail if the target directory is emptyps/new-workdir-into-empty-directoryPaul Smith2014-12-031-15/+38
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/ls-tree-pathspec'Junio C Hamano2014-12-2210-69/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t3102: style modernizationnd/ls-tree-pathspecJunio C Hamano2014-12-011-8/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t3102: document that ls-tree does not yet support negated pathspecJunio C Hamano2014-12-011-0/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | ls-tree: disable negative pathspec because it's not supportedNguyễn Thái Ngọc Duy2014-12-011-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | ls-tree: remove path filtering logic in show_treeNguyễn Thái Ngọc Duy2014-12-014-30/+15