summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pb/strbuf-read-file-doc'Junio C Hamano2016-06-271-0/+2
|\
| * strbuf: describe the return value of strbuf_read_filepb/strbuf-read-file-docPranit Bauva2016-06-141-0/+2
* | Merge branch 'dn/gpg-doc'Junio C Hamano2016-06-272-2/+2
|\ \
| * | Documentation: GPG capitalizationdn/gpg-docDave Nicolson2016-06-162-2/+2
| |/
* | Merge branch 'jk/fetch-prune-doc'Junio C Hamano2016-06-271-1/+1
|\ \
| * | fetch: document that pruning happens before fetchingjk/fetch-prune-docJeff King2016-06-141-1/+1
| |/
* | Merge branch 'ap/git-svn-propset-doc'Junio C Hamano2016-06-271-0/+14
|\ \
| * | git-svn: document the 'git svn propset' commandap/git-svn-propset-docAlfred Perlstein2016-06-151-0/+14
* | | Merge branch 'tr/doc-tt'Junio C Hamano2016-06-2736-217/+224
|\ \ \
| * | | doc: change configuration variables formattr/doc-ttTom Russello2016-06-0817-86/+86
| * | | doc: more consistency in environment variables formatTom Russello2016-06-0817-27/+27
| * | | doc: change environment variables formatTom Russello2016-06-089-101/+101
| * | | doc: clearer rule about formatting literalsTom Russello2016-06-081-3/+10
* | | | Merge branch 'pc/occurred'Junio C Hamano2016-06-272-2/+2
|\ \ \ \
| * | | | config.c: fix misspelt "occurred" in an error messagepc/occurredPeter Colberg2016-06-101-1/+1
| * | | | refs.h: fix misspelt "occurred" in a commentPeter Colberg2016-06-101-1/+1
| |/ / /
* | | | Merge branch 'cc/apply-introduce-state'Junio C Hamano2016-06-271-609/+820
|\ \ \ \
| * | | | builtin/apply: remove misleading comment on lock_file fieldcc/apply-introduce-stateJunio C Hamano2016-06-061-4/+1
| * | | | builtin/apply: move 'newfd' global into 'struct apply_state'Christian Couder2016-06-031-4/+5
| * | | | builtin/apply: add 'lock_file' pointer into 'struct apply_state'Christian Couder2016-06-031-4/+15
| * | | | builtin/apply: move applying patches into apply_all_patches()Christian Couder2016-06-011-58/+71
| * | | | builtin/apply: move 'state' check into check_apply_state()Christian Couder2016-06-011-23/+29
| * | | | builtin/apply: move 'symlink_changes' global into 'struct apply_state'Christian Couder2016-06-011-22/+28
| * | | | builtin/apply: move 'fn_table' global into 'struct apply_state'Christian Couder2016-06-011-22/+25
| * | | | builtin/apply: move 'state_linenr' global into 'struct apply_state'Christian Couder2016-06-011-35/+36
| * | | | builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'Christian Couder2016-06-011-24/+25
| * | | | builtin/apply: move 'ws_ignore_action' into 'struct apply_state'Christian Couder2016-06-011-17/+20
| * | | | builtin/apply: move 'ws_error_action' into 'struct apply_state'Christian Couder2016-06-011-28/+33
| * | | | builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'Christian Couder2016-06-011-5/+5
| * | | | builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'Christian Couder2016-06-011-11/+11
| * | | | builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()Christian Couder2016-06-011-5/+4
| * | | | builtin/apply: move 'whitespace_option' into 'struct apply_state'Christian Couder2016-06-011-7/+6
| * | | | builtin/apply: move 'whitespace_error' global into 'struct apply_state'Christian Couder2016-06-011-13/+15
| * | | | builtin/apply: move 'root' global into 'struct apply_state'Christian Couder2016-06-011-33/+49
| * | | | builtin/apply: move 'p_value_known' global into 'struct apply_state'Christian Couder2016-06-011-5/+4
| * | | | builtin/apply: move 'p_value' global into 'struct apply_state'Christian Couder2016-06-011-52/+99
| * | | | builtin/apply: move 'has_include' global into 'struct apply_state'Christian Couder2016-06-011-3/+3
| * | | | builtin/apply: move 'limit_by_name' global into 'struct apply_state'Christian Couder2016-06-011-10/+16
| * | | | builtin/apply: move 'patch_input_file' global into 'struct apply_state'Christian Couder2016-06-011-10/+17
| * | | | builtin/apply: move 'apply' global into 'struct apply_state'Christian Couder2016-06-011-14/+17
| * | | | builtin/apply: move 'p_context' global into 'struct apply_state'Christian Couder2016-06-011-3/+4
| * | | | builtin/apply: move 'fake_ancestor' global into 'struct apply_state'Christian Couder2016-06-011-8/+5
| * | | | builtin/apply: move 'line_termination' global into 'struct apply_state'Christian Couder2016-06-011-5/+9
| * | | | builtin/apply: move 'unsafe_paths' global into 'struct apply_state'Christian Couder2016-06-011-4/+4
| * | | | builtin/apply: move 'no_add' global into 'struct apply_state'Christian Couder2016-06-011-3/+3
| * | | | builtin/apply: move 'threeway' global into 'struct apply_state'Christian Couder2016-06-011-7/+7
| * | | | builtin/apply: move 'summary' global into 'struct apply_state'Christian Couder2016-06-011-4/+4
| * | | | builtin/apply: move 'numstat' global into 'struct apply_state'Christian Couder2016-06-011-5/+4
| * | | | builtin/apply: move 'diffstat' global into 'struct apply_state'Christian Couder2016-06-011-5/+6
| * | | | builtin/apply: move 'cached' global into 'struct apply_state'Christian Couder2016-06-011-16/+19