Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'oh/fix-config-default-user-name-section' | Junio C Hamano | 2015-05-05 |
|\ | |||
| * | config: fix settings in default_user_config template | Ossi Herrala | 2015-04-17 |
* | | Merge branch 'ts/checkout-advice-plural' | Junio C Hamano | 2015-05-05 |
|\ \ | |||
| * | | checkout: call a single commit "it" intead of "them" | Thomas Schneider | 2015-04-02 |
* | | | Merge branch 'jk/init-core-worktree-at-root' | Junio C Hamano | 2015-05-05 |
|\ \ \ | |||
| * | | | init: don't set core.worktree when initializing /.git | Jeff King | 2015-04-02 |
* | | | | Merge branch 'mh/show-branch-topic' | Junio C Hamano | 2015-05-05 |
|\ \ \ \ | |||
| * | | | | show-branch: show all local heads when only giving one rev along --topics | Mike Hommey | 2015-03-31 |
* | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2015-05-05 |
|\ \ \ \ \ | |||
| * | | | | | apply: convert threeway_stage to object_id | brian m. carlson | 2015-03-13 |
| * | | | | | patch-id: convert to use struct object_id | brian m. carlson | 2015-03-13 |
* | | | | | | Merge branch 'ps/grep-help-all-callback-arg' | Junio C Hamano | 2015-04-20 |
|\ \ \ \ \ \ | |||
| * | | | | | | grep: correctly initialize help-all option | Patrick Steinhardt | 2015-04-12 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | Revert "merge: pass verbosity flag down to merge-recursive" | Junio C Hamano | 2015-04-16 |
* | | | | | | Merge branch 'jk/merge-quiet' | Junio C Hamano | 2015-04-14 |
|\ \ \ \ \ \ | |||
| * | | | | | | merge: pass verbosity flag down to merge-recursive | Jeff King | 2015-04-02 |
| |/ / / / / | |||
* | | | | | | Merge branch 'jc/update-instead-into-void' | Junio C Hamano | 2015-04-14 |
|\ \ \ \ \ \ | |||
| * | | | | | | push-to-deploy: allow pushing into an unborn branch and updating it | Junio C Hamano | 2015-04-01 |
* | | | | | | | Merge branch 'sb/leaks' | Junio C Hamano | 2015-03-27 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||
| * | | | | | | commit.c: fix a memory leak | Stefan Beller | 2015-03-23 |
| * | | | | | | builtin/apply.c: fix a memleak | Stefan Beller | 2015-03-23 |
| * | | | | | | update-index: fix a memleak | Stefan Beller | 2015-03-22 |
* | | | | | | | Merge branch 'jc/report-path-error-to-dir' | Junio C Hamano | 2015-03-26 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | report_path_error(): move to dir.c | Junio C Hamano | 2015-03-24 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jk/prune-with-corrupt-refs' | Junio C Hamano | 2015-03-25 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | 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 'nd/grep-exclude-standard-help-fix' into maint | Junio C Hamano | 2015-03-13 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'jc/apply-beyond-symlink' into maint | Junio C Hamano | 2015-03-13 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jk/cleanup-failed-clone' | Junio C Hamano | 2015-03-25 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | 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 'ws/grep-quiet-no-pager' | Junio C Hamano | 2015-03-25 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | grep: fix "--quiet" overwriting current output | Wilhelm Schuermann | 2015-03-19 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'jk/push-config' | Junio C Hamano | 2015-03-23 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | push: allow --follow-tags to be set by config push.followTags | Dave Olszewski | 2015-03-14 |
| * | | | | | | | | | cmd_push: pass "flags" pointer to config callback | Jeff King | 2015-02-17 |
| * | | | | | | | | | cmd_push: set "atomic" bit directly | Jeff King | 2015-02-17 |
| * | | | | | | | | | git_push_config: drop cargo-culted wt_status pointer | Jeff King | 2015-02-15 |
* | | | | | | | | | | Merge branch 'jk/tag-h-column-is-a-listing-option' | Junio C Hamano | 2015-03-23 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | tag: fix some mis-organized options in "-h" listing | Jeff King | 2015-03-12 |
* | | | | | | | | | | | Merge branch 'sb/leaks' | Junio C Hamano | 2015-03-20 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | builtin/help.c: fix memory leak | Stefan Beller | 2015-03-10 |
* | | | | | | | | | | | Merge branch 'km/bsd-shells' | Junio C Hamano | 2015-03-20 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | help.c: use SHELL_PATH instead of hard-coded "/bin/sh" | Kyle J. McKay | 2015-03-10 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | Merge branch 'rs/simple-cleanups' into maint | Junio C Hamano | 2015-03-06 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/blame-commit-info-fix' into maint | Junio C Hamano | 2015-03-05 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/merge-file-prefix' into maint | Junio C Hamano | 2015-03-05 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dp/remove-duplicated-header-inclusion' into maint | Junio C Hamano | 2015-03-05 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ws-fix-expands' into maint | Junio C Hamano | 2015-02-24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |