Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'oh/fix-config-default-user-name-section' | Junio C Hamano | 2015-05-05 | 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 'ts/checkout-advice-plural' | Junio C Hamano | 2015-05-05 | 1 | -2/+9 |
|\ \ | |||||
| * | | checkout: call a single commit "it" intead of "them"ts/checkout-advice-plural | Thomas Schneider | 2015-04-02 | 1 | -2/+9 |
* | | | Merge branch 'jk/init-core-worktree-at-root' | Junio C Hamano | 2015-05-05 | 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 |
* | | | | Merge branch 'mh/show-branch-topic' | Junio C Hamano | 2015-05-05 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | show-branch: show all local heads when only giving one rev along --topicsmh/show-branch-topic | Mike Hommey | 2015-03-31 | 1 | -3/+3 |
* | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2015-05-05 | 2 | -24/+24 |
|\ \ \ \ \ | |||||
| * | | | | | apply: convert threeway_stage to object_id | brian m. carlson | 2015-03-13 | 1 | -7/+7 |
| * | | | | | patch-id: convert to use struct object_id | brian m. carlson | 2015-03-13 | 1 | -17/+17 |
* | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |