aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'sg/reflog-past-root'Junio C Hamano2016-06-27
|\
| * reflog: continue walking the reflog past root commitsSZEDER Gábor2016-06-06
* | Merge branch 'pb/strbuf-read-file-doc'Junio C Hamano2016-06-27
|\ \
| * | strbuf: describe the return value of strbuf_read_filePranit Bauva2016-06-14
* | | Merge branch 'dn/gpg-doc'Junio C Hamano2016-06-27
|\ \ \
| * | | Documentation: GPG capitalizationDave Nicolson2016-06-16
| |/ /
* | | Merge branch 'jk/fetch-prune-doc'Junio C Hamano2016-06-27
|\ \ \
| * | | fetch: document that pruning happens before fetchingJeff King2016-06-14
| |/ /
* | | Merge branch 'ap/git-svn-propset-doc'Junio C Hamano2016-06-27
|\ \ \
| * | | git-svn: document the 'git svn propset' commandAlfred Perlstein2016-06-15
* | | | Merge branch 'tr/doc-tt'Junio C Hamano2016-06-27
|\ \ \ \
| * | | | doc: change configuration variables formatTom Russello2016-06-08
| * | | | doc: more consistency in environment variables formatTom Russello2016-06-08
| * | | | doc: change environment variables formatTom Russello2016-06-08
| * | | | doc: clearer rule about formatting literalsTom Russello2016-06-08
* | | | | Merge branch 'pc/occurred'Junio C Hamano2016-06-27
|\ \ \ \ \
| * | | | | config.c: fix misspelt "occurred" in an error messagePeter Colberg2016-06-10
| * | | | | refs.h: fix misspelt "occurred" in a commentPeter Colberg2016-06-10
| |/ / / /
* | | | | Merge branch 'cc/apply-introduce-state'Junio C Hamano2016-06-27
|\ \ \ \ \
| * | | | | builtin/apply: remove misleading comment on lock_file fieldJunio C Hamano2016-06-06
| * | | | | builtin/apply: move 'newfd' global into 'struct apply_state'Christian Couder2016-06-03
| * | | | | builtin/apply: add 'lock_file' pointer into 'struct apply_state'Christian Couder2016-06-03
| * | | | | builtin/apply: move applying patches into apply_all_patches()Christian Couder2016-06-01
| * | | | | builtin/apply: move 'state' check into check_apply_state()Christian Couder2016-06-01
| * | | | | builtin/apply: move 'symlink_changes' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'fn_table' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'state_linenr' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'ws_ignore_action' into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'ws_error_action' into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()Christian Couder2016-06-01
| * | | | | builtin/apply: move 'whitespace_option' into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'whitespace_error' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'root' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'p_value_known' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'p_value' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'has_include' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'limit_by_name' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'patch_input_file' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'apply' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'p_context' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'fake_ancestor' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'line_termination' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'unsafe_paths' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'no_add' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'threeway' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'summary' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | builtin/apply: move 'numstat' global into 'struct apply_state'Christian Couder2016-06-01