Commit message (Expand) | Author | Age | |
---|---|---|---|
* | react to errors in xdi_diff | Jeff King | 2015-09-28 |
* | Sync with 2.2.3 | Junio C Hamano | 2015-09-04 |
|\ | |||
| * | show-branch: use a strbuf for reflog descriptions | Jeff King | 2015-09-04 |
* | | Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3 | Junio C Hamano | 2015-05-11 |
|\ \ | |||
| * | | config: fix settings in default_user_config template | Ossi Herrala | 2015-04-17 |
* | | | Merge branch 'jc/report-path-error-to-dir' into maint | Junio C Hamano | 2015-03-31 |
|\ \ \ | |||
| * | | | report_path_error(): move to dir.c | Junio C Hamano | 2015-03-24 |
* | | | | Merge branch 'ws/grep-quiet-no-pager' into maint | Junio C Hamano | 2015-03-28 |
|\ \ \ \ | |||
| * | | | | grep: fix "--quiet" overwriting current output | Wilhelm Schuermann | 2015-03-19 |
| |/ / / | |||
* | | | | Merge branch 'jk/cleanup-failed-clone' into maint | Junio C Hamano | 2015-03-28 |
|\ \ \ \ | |||
| * | | | | clone: drop period from end of die_errno message | Jeff King | 2015-03-19 |
| * | | | | clone: initialize atexit cleanup handler earlier | Jeff King | 2015-03-19 |
| |/ / / | |||
* | | | | Merge branch 'jk/prune-with-corrupt-refs' into maint | Junio C Hamano | 2015-03-28 |
|\ \ \ \ | |||
| * | | | | repack: turn on "ref paranoia" when doing a destructive repack | Jeff King | 2015-03-20 |
| * | | | | prune: turn on ref_paranoia flag | Jeff King | 2015-03-20 |
* | | | | | Merge branch 'jk/tag-h-column-is-a-listing-option' into maint | Junio C Hamano | 2015-03-27 |
|\ \ \ \ \ | |||
| * | | | | | tag: fix some mis-organized options in "-h" listing | Jeff King | 2015-03-12 |
* | | | | | | Merge branch 'rs/deflate-init-cleanup' into maint | Junio C Hamano | 2015-03-23 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||
| * | | | | | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw} | René Scharfe | 2015-03-05 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'nd/grep-exclude-standard-help-fix' into maint | Junio C Hamano | 2015-03-13 |
|\ \ \ \ \ | |||
| * | | | | | grep: correct help string for --exclude-standard | Nguyễn Thái Ngọc Duy | 2015-02-27 |
| |/ / / / | |||
* | | | | | Merge branch 'jc/apply-beyond-symlink' into maint | Junio C Hamano | 2015-03-13 |
|\ \ \ \ \ | |||
| * | | | | | apply: do not touch a file beyond a symbolic link | Junio C Hamano | 2015-02-10 |
| * | | | | | apply: do not read from beyond a symbolic link | Junio C Hamano | 2015-02-10 |
| * | | | | | apply: do not read from the filesystem under --index | Junio C Hamano | 2015-02-10 |
| * | | | | | apply: reject input that touches outside the working area | Junio C Hamano | 2015-02-10 |
* | | | | | | Merge branch 'rs/simple-cleanups' into maint | Junio C Hamano | 2015-03-06 |
|\ \ \ \ \ \ | |||
| * | | | | | | for-each-ref: use skip_prefix() to avoid duplicate string comparison | René Scharfe | 2015-02-22 |
* | | | | | | | Merge branch 'es/blame-commit-info-fix' into maint | Junio C Hamano | 2015-03-05 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | builtin/blame: destroy initialized commit_info only | Eric Sunshine | 2015-02-10 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'ab/merge-file-prefix' into maint | Junio C Hamano | 2015-03-05 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | merge-file: correctly open files when in a subdir | Aleksander Boruch-Gruszecki | 2015-02-11 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'dp/remove-duplicated-header-inclusion' into maint | Junio C Hamano | 2015-03-05 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | do not include the same header twice | Дилян Палаузов | 2015-02-13 |
* | | | | | | | | Merge branch 'jc/apply-ws-fix-expands' into maint | Junio C Hamano | 2015-02-24 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | apply: count the size of postimage correctly | Junio C Hamano | 2015-01-22 |
| * | | | | | | | | apply: make update_pre_post_images() sanity check the given postlen | Junio C Hamano | 2015-01-22 |
| * | | | | | | | | apply.c: typofix | Junio C Hamano | 2015-01-22 |
| | |_|_|/ / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'mg/commit-author-no-match-malformed-message' into maint | Junio C Hamano | 2015-02-24 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | commit: reword --author error message | Michael J Gruber | 2015-01-26 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'dk/format-patch-ignore-diff-submodule' into maint | Junio C Hamano | 2015-02-24 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | format-patch: ignore diff.submodule setting | Doug Kelly | 2015-01-07 |
* | | | | | | | | | Merge branch 'jk/blame-commit-label' into maint | Junio C Hamano | 2015-02-24 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||
| * | | | | | | | | blame.c: fix garbled error message | Lukas Fleischer | 2015-01-13 |
| * | | | | | | | | builtin/commit.c: use xstrdup_or_null instead of envdup | Jeff King | 2015-01-13 |
| * | | | | | | | | builtin/apply.c: use xstrdup_or_null instead of null_strdup | Jeff King | 2015-01-13 |
* | | | | | | | | | Merge branch 'ak/cat-file-clean-up' | Junio C Hamano | 2015-01-22 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | cat-file: use "type" and "size" from outer scope | Alexander Kuleshov | 2015-01-13 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
| * | | | | | | | | Merge branch 'mg/add-ignore-errors' into maint | Junio C Hamano | 2015-01-12 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'ak/show-branch-usage-string' | Junio C Hamano | 2015-01-20 |
|\ \ \ \ \ \ \ \ \ |