aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'oh/fix-config-default-user-name-section'Junio C Hamano2015-05-05
|\
| * config: fix settings in default_user_config templateOssi Herrala2015-04-17
* | Merge branch 'ts/checkout-advice-plural'Junio C Hamano2015-05-05
|\ \
| * | checkout: call a single commit "it" intead of "them"Thomas Schneider2015-04-02
* | | Merge branch 'jk/init-core-worktree-at-root'Junio C Hamano2015-05-05
|\ \ \
| * | | init: don't set core.worktree when initializing /.gitJeff King2015-04-02
* | | | Merge branch 'mh/show-branch-topic'Junio C Hamano2015-05-05
|\ \ \ \
| * | | | show-branch: show all local heads when only giving one rev along --topicsMike Hommey2015-03-31
* | | | | Merge branch 'bc/object-id'Junio C Hamano2015-05-05
|\ \ \ \ \
| * | | | | apply: convert threeway_stage to object_idbrian m. carlson2015-03-13
| * | | | | patch-id: convert to use struct object_idbrian m. carlson2015-03-13
* | | | | | Merge branch 'ps/grep-help-all-callback-arg'Junio C Hamano2015-04-20
|\ \ \ \ \ \
| * | | | | | grep: correctly initialize help-all optionPatrick Steinhardt2015-04-12
| | |_|/ / / | |/| | | |
* | | | | | Revert "merge: pass verbosity flag down to merge-recursive"Junio C Hamano2015-04-16
* | | | | | Merge branch 'jk/merge-quiet'Junio C Hamano2015-04-14
|\ \ \ \ \ \
| * | | | | | merge: pass verbosity flag down to merge-recursiveJeff King2015-04-02
| |/ / / / /
* | | | | | Merge branch 'jc/update-instead-into-void'Junio C Hamano2015-04-14
|\ \ \ \ \ \
| * | | | | | push-to-deploy: allow pushing into an unborn branch and updating itJunio C Hamano2015-04-01
* | | | | | | Merge branch 'sb/leaks'Junio C Hamano2015-03-27
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | commit.c: fix a memory leakStefan Beller2015-03-23
| * | | | | | builtin/apply.c: fix a memleakStefan Beller2015-03-23
| * | | | | | update-index: fix a memleakStefan Beller2015-03-22
* | | | | | | Merge branch 'jc/report-path-error-to-dir'Junio C Hamano2015-03-26
|\ \ \ \ \ \ \
| * | | | | | | report_path_error(): move to dir.cJunio C Hamano2015-03-24
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/prune-with-corrupt-refs'Junio C Hamano2015-03-25
|\ \ \ \ \ \ \
| * | | | | | | repack: turn on "ref paranoia" when doing a destructive repackJeff King2015-03-20
| * | | | | | | prune: turn on ref_paranoia flagJeff King2015-03-20
| * | | | | | | Merge branch 'nd/grep-exclude-standard-help-fix' into maintJunio C Hamano2015-03-13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/apply-beyond-symlink' into maintJunio C Hamano2015-03-13
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/cleanup-failed-clone'Junio C Hamano2015-03-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone: drop period from end of die_errno messageJeff King2015-03-19
| * | | | | | | | | clone: initialize atexit cleanup handler earlierJeff King2015-03-19
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ws/grep-quiet-no-pager'Junio C Hamano2015-03-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep: fix "--quiet" overwriting current outputWilhelm Schuermann2015-03-19
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/push-config'Junio C Hamano2015-03-23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | push: allow --follow-tags to be set by config push.followTagsDave Olszewski2015-03-14
| * | | | | | | | | cmd_push: pass "flags" pointer to config callbackJeff King2015-02-17
| * | | | | | | | | cmd_push: set "atomic" bit directlyJeff King2015-02-17
| * | | | | | | | | git_push_config: drop cargo-culted wt_status pointerJeff King2015-02-15
* | | | | | | | | | Merge branch 'jk/tag-h-column-is-a-listing-option'Junio C Hamano2015-03-23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tag: fix some mis-organized options in "-h" listingJeff King2015-03-12
* | | | | | | | | | | Merge branch 'sb/leaks'Junio C Hamano2015-03-20
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | builtin/help.c: fix memory leakStefan Beller2015-03-10
* | | | | | | | | | | Merge branch 'km/bsd-shells'Junio C Hamano2015-03-20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | help.c: use SHELL_PATH instead of hard-coded "/bin/sh"Kyle J. McKay2015-03-10
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'rs/simple-cleanups' into maintJunio C Hamano2015-03-06
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'es/blame-commit-info-fix' into maintJunio C Hamano2015-03-05
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/merge-file-prefix' into maintJunio C Hamano2015-03-05
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dp/remove-duplicated-header-inclusion' into maintJunio C Hamano2015-03-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2015-02-24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \