Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kf/askpass-config' | Junio C Hamano | 2010-09-08 | 1 | -0/+1 |
|\ | |||||
| * | Add a new option 'core.askpass'. | Anselm Kruis | 2010-08-31 | 1 | -0/+1 |
* | | Merge branch 'jk/maint-pass-c-config-in-env' | Junio C Hamano | 2010-09-08 | 1 | -1/+4 |
|\ \ | |||||
| * | | do not pass "git -c foo=bar" params to transport helpers | Jonathan Nieder | 2010-08-24 | 1 | -1/+1 |
| * | | pass "git -c foo=bar" params through environment | Jeff King | 2010-08-24 | 1 | -0/+3 |
| |/ | |||||
* | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 1 | -0/+1 |
|\ \ | |||||
| * | | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 | 1 | -1/+0 |
| * | | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 | 1 | -0/+2 |
| |/ | |||||
* | | Merge branch 'jn/paginate-fix' | Junio C Hamano | 2010-08-31 | 1 | -0/+6 |
|\ \ | |||||
| * | | setup: remember whether repository was found | Nguyễn Thái Ngọc Duy | 2010-08-11 | 1 | -0/+1 |
| * | | git wrapper: introduce startup_info struct | Nguyễn Thái Ngọc Duy | 2010-08-11 | 1 | -0/+5 |
| |/ | |||||
* | | Merge branch 'gb/split-cmdline-errmsg' | Junio C Hamano | 2010-08-21 | 1 | -0/+2 |
|\ \ | |||||
| * | | split_cmdline: Allow caller to access error string | Greg Brockman | 2010-08-11 | 1 | -0/+2 |
| |/ | |||||
* | | Merge branch 'nd/fix-sparse-checkout' | Junio C Hamano | 2010-08-21 | 1 | -2/+1 |
|\ \ | |||||
| * | | unpack-trees: let read-tree -u remove index entries outside sparse area | Nguyễn Thái Ngọc Duy | 2010-08-09 | 1 | -2/+1 |
* | | | Merge branch 'hv/submodule-find-ff-merge' | Junio C Hamano | 2010-08-21 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | Teach ref iteration module about submodules | Heiko Voigt | 2010-07-07 | 1 | -0/+3 |
| | |/ | |/| | |||||
* | | | Merge branch 'jn/parse-date-basic' | Junio C Hamano | 2010-08-12 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Export parse_date_basic() to convert a date string to timestamp | Jonathan Nieder | 2010-07-15 | 1 | -0/+1 |
| |/ / | |||||
* | | | Standardize do { ... } while (0) style | Jonathan Nieder | 2010-08-12 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'cp/textconv-cat-file' | Junio C Hamano | 2010-06-27 | 1 | -0/+11 |
|\ \ | |||||
| * | | sha1_name: add get_sha1_with_context() | Clément Poulain | 2010-06-18 | 1 | -0/+11 |
* | | | Merge branch 'eb/core-eol' | Junio C Hamano | 2010-06-21 | 1 | -1/+21 |
|\ \ \ | |||||
| * | | | Add "core.eol" config variable | Eyvind Bernhardsen | 2010-06-06 | 1 | -0/+13 |
| * | | | Add per-repository eol normalization | Eyvind Bernhardsen | 2010-05-19 | 1 | -1/+8 |
| | |/ | |/| | |||||
* | | | Merge branch 'gv/portable' | Junio C Hamano | 2010-06-21 | 1 | -8/+8 |
|\ \ \ | |_|/ |/| | | |||||
| * | | enums: omit trailing comma for portability | Gary V. Vaughan | 2010-05-31 | 1 | -8/+8 |
* | | | Merge branch 'sp/maint-dumb-http-pack-reidx' | Junio C Hamano | 2010-05-21 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Allow parse_pack_index on temporary files | Shawn O. Pearce | 2010-04-19 | 1 | -1/+1 |
| * | | | Introduce close_pack_index to permit replacement | Shawn O. Pearce | 2010-04-19 | 1 | -0/+1 |
| * | | | Merge branch 'gb/maint-submodule-env' into maint | Junio C Hamano | 2010-03-08 | 1 | -0/+9 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'mm/mkstemps-mode-for-packfiles' into maint | Junio C Hamano | 2010-03-08 | 1 | -0/+4 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'ld/discovery-limit-to-fs' (early part) | Junio C Hamano | 2010-05-21 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config.c: remove static keyword from git_env_bool() | Lars R. Damerow | 2010-03-28 | 1 | -0/+1 |
* | | | | | | | Merge branch 'ar/config-from-command-line' | Junio C Hamano | 2010-05-21 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Complete prototype of git_config_from_parameters() | Thomas Rast | 2010-05-21 | 1 | -1/+1 |
| * | | | | | | | Allow passing of configuration parameters in the command line | Alex Riesen | 2010-03-28 | 1 | -0/+2 |
* | | | | | | | | Merge branch 'sd/log-decorate' | Junio C Hamano | 2010-05-08 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git_config_maybe_bool() | Junio C Hamano | 2010-02-17 | 1 | -0/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'cw/ws-indent-with-tab' | Junio C Hamano | 2010-05-08 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst | Chris Webb | 2010-04-04 | 1 | -1/+1 |
| * | | | | | | | | whitespace: add tab-in-indent error class | Chris Webb | 2010-04-02 | 1 | -0/+1 |
* | | | | | | | | | make commit_tree a library function | Jeff King | 2010-04-01 | 1 | -0/+2 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | fix const-correctness of write_sha1_file | Jeff King | 2010-04-01 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | builtin/merge: make checkout_fast_forward() non static | Junio C Hamano | 2010-03-06 | 1 | -0/+3 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | notes: implement helpers needed for note copying during rewrite | Thomas Rast | 2010-03-12 | 1 | -0/+2 |
| * | | | | | | Support showing notes from more than one notes tree | Thomas Rast | 2010-03-12 | 1 | -0/+1 |
* | | | | | | | Merge branch 'fl/askpass' | Junio C Hamano | 2010-03-20 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | |