Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'jk/init-core-worktree-at-root' into maint | Junio C Hamano | 2015-05-13 | 1 | -3/+15 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | init: don't set core.worktree when initializing /.gitjk/init-core-worktree-at-root | Jeff King | 2015-04-02 | 1 | -3/+15 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Sync with 2.3.8 | Junio C Hamano | 2015-05-11 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3 | Junio C Hamano | 2015-05-11 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | config: fix settings in default_user_config templateoh/fix-config-default-user-name-section | Ossi Herrala | 2015-04-17 | 1 | -2/+2 | |
| * | | | | | | | | | Merge branch 'jc/report-path-error-to-dir' into maint | Junio C Hamano | 2015-03-31 | 1 | -43/+0 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ws/grep-quiet-no-pager' into maint | Junio C Hamano | 2015-03-28 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/cleanup-failed-clone' into maint | Junio C Hamano | 2015-03-28 | 1 | -5/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/prune-with-corrupt-refs' into maint | Junio C Hamano | 2015-03-28 | 2 | -2/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/tag-h-column-is-a-listing-option' into maint | Junio C Hamano | 2015-03-27 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/deflate-init-cleanup' into maint | Junio C Hamano | 2015-03-23 | 2 | -3/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/grep-help-all-callback-arg' | Junio C Hamano | 2015-04-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | grep: correctly initialize help-all optionps/grep-help-all-callback-arg | Patrick Steinhardt | 2015-04-12 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Revert "merge: pass verbosity flag down to merge-recursive" | Junio C Hamano | 2015-04-16 | 1 | -4/+0 | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/merge-quiet' | Junio C Hamano | 2015-04-14 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | merge: pass verbosity flag down to merge-recursive | Jeff King | 2015-04-02 | 1 | -0/+4 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'jc/update-instead-into-void' | Junio C Hamano | 2015-04-14 | 1 | -1/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | push-to-deploy: allow pushing into an unborn branch and updating itjc/update-instead-into-void | Junio C Hamano | 2015-04-01 | 1 | -1/+20 | |
* | | | | | | | | | | | | | | | | | Merge branch 'sb/leaks' | Junio C Hamano | 2015-03-27 | 3 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | commit.c: fix a memory leak | Stefan Beller | 2015-03-23 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | | | | | builtin/apply.c: fix a memleak | Stefan Beller | 2015-03-23 | 1 | -1/+3 | |
| * | | | | | | | | | | | | | | | | | update-index: fix a memleak | Stefan Beller | 2015-03-22 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/report-path-error-to-dir' | Junio C Hamano | 2015-03-26 | 1 | -43/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | report_path_error(): move to dir.cjc/report-path-error-to-dir | Junio C Hamano | 2015-03-24 | 1 | -43/+0 | |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/prune-with-corrupt-refs' | Junio C Hamano | 2015-03-25 | 2 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | repack: turn on "ref paranoia" when doing a destructive repack | Jeff King | 2015-03-20 | 1 | -2/+6 | |
| * | | | | | | | | | | | | | | | | prune: turn on ref_paranoia flag | Jeff King | 2015-03-20 | 1 | -0/+1 | |
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'nd/grep-exclude-standard-help-fix' into maint | Junio C Hamano | 2015-03-13 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-beyond-symlink' into maint | Junio C Hamano | 2015-03-13 | 1 | -1/+141 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/cleanup-failed-clone' | Junio C Hamano | 2015-03-25 | 1 | -5/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | clone: drop period from end of die_errno messagejk/cleanup-failed-clone | Jeff King | 2015-03-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | clone: initialize atexit cleanup handler earlier | Jeff King | 2015-03-19 | 1 | -4/+5 | |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'ws/grep-quiet-no-pager' | Junio C Hamano | 2015-03-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | grep: fix "--quiet" overwriting current outputws/grep-quiet-no-pager | Wilhelm Schuermann | 2015-03-19 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/push-config' | Junio C Hamano | 2015-03-23 | 1 | -8/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | push: allow --follow-tags to be set by config push.followTagsjk/push-config | Dave Olszewski | 2015-03-14 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | cmd_push: pass "flags" pointer to config callback | Jeff King | 2015-02-17 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | cmd_push: set "atomic" bit directly | Jeff King | 2015-02-17 | 1 | -5/+1 | |
| * | | | | | | | | | | | | | | | | git_push_config: drop cargo-culted wt_status pointer | Jeff King | 2015-02-15 | 1 | -2/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/tag-h-column-is-a-listing-option' | Junio C Hamano | 2015-03-23 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | tag: fix some mis-organized options in "-h" listingjk/tag-h-column-is-a-listing-option | Jeff King | 2015-03-12 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | Merge branch 'sb/leaks' | Junio C Hamano | 2015-03-20 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | builtin/help.c: fix memory leak | Stefan Beller | 2015-03-10 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | Merge branch 'km/bsd-shells' | Junio C Hamano | 2015-03-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | help.c: use SHELL_PATH instead of hard-coded "/bin/sh" | Kyle J. McKay | 2015-03-10 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'rs/simple-cleanups' into maint | Junio C Hamano | 2015-03-06 | 1 | -4/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/blame-commit-info-fix' into maint | Junio C Hamano | 2015-03-05 | 1 | -3/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/merge-file-prefix' into maint | Junio C Hamano | 2015-03-05 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dp/remove-duplicated-header-inclusion' into maint | Junio C Hamano | 2015-03-05 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ws-fix-expands' into maint | Junio C Hamano | 2015-02-24 | 1 | -3/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |