Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rt/commit-cleanup-config' | Junio C Hamano | 2013-01-20 | 1 | -1/+3 |
|\ | |||||
| * | commit: make default of "cleanup" option configurable | Ralf Thielow | 2013-01-10 | 1 | -1/+3 |
* | | Merge branch 'ap/log-mailmap' | Junio C Hamano | 2013-01-20 | 3 | -137/+116 |
|\ \ | |||||
| * | | log: add log.mailmap configuration option | Antoine Pelisse | 2013-01-10 | 1 | -0/+7 |
| * | | log: add --use-mailmap option | Antoine Pelisse | 2013-01-10 | 1 | -1/+8 |
| * | | mailmap: simplify map_user() interface | Antoine Pelisse | 2013-01-10 | 2 | -95/+93 |
| * | | Use split_ident_line to parse author and committer | Antoine Pelisse | 2013-01-07 | 2 | -64/+31 |
* | | | Merge branch 'jc/blame-no-follow' | Junio C Hamano | 2013-01-14 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | blame: pay attention to --no-follow | Junio C Hamano | 2012-09-21 | 1 | -1/+5 |
* | | | | Merge branch 'jc/merge-blobs' | Junio C Hamano | 2013-01-11 | 2 | -37/+59 |
|\ \ \ \ | |||||
| * | | | | merge-tree: fix d/f conflicts | Junio C Hamano | 2012-12-26 | 1 | -32/+40 |
| * | | | | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano | 2012-12-26 | 1 | -4/+22 |
| * | | | | merge-tree: lose unused "resolve_directories" | Junio C Hamano | 2012-12-26 | 1 | -3/+0 |
| * | | | | merge-tree: lose unused "flags" from merge_list | Junio C Hamano | 2012-12-26 | 1 | -2/+1 |
| * | | | | Which merge_file() function do you mean? | Junio C Hamano | 2012-12-09 | 2 | -4/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jc/format-patch-reroll' | Junio C Hamano | 2013-01-11 | 1 | -9/+24 |
|\ \ \ \ | |||||
| * | | | | format-patch: give --reroll-count a short synonym -v | Junio C Hamano | 2013-01-03 | 1 | -1/+1 |
| * | | | | format-patch: add --reroll-count=$N option | Junio C Hamano | 2012-12-22 | 1 | -0/+11 |
| * | | | | get_patch_filename(): split into two functions | Junio C Hamano | 2012-12-21 | 1 | -1/+3 |
| * | | | | get_patch_filename(): drop "just-numbers" hack | Junio C Hamano | 2012-12-21 | 1 | -1/+4 |
| * | | | | get_patch_filename(): simplify function signature | Junio C Hamano | 2012-12-21 | 1 | -1/+1 |
| * | | | | builtin/log.c: stop using global patch_suffix | Junio C Hamano | 2012-12-21 | 1 | -2/+2 |
| * | | | | builtin/log.c: drop redundant "numbered_files" parameter from make_cover_lett... | Junio C Hamano | 2012-12-21 | 1 | -7/+6 |
| * | | | | builtin/log.c: drop unused "numbered" parameter from make_cover_letter() | Junio C Hamano | 2012-12-21 | 1 | -2/+2 |
* | | | | | Merge branch 'jl/interrupt-clone-remove-separate-git-dir' | Junio C Hamano | 2013-01-10 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | clone: support atomic operation with --separate-git-dir | Jens Lehmann | 2013-01-05 | 1 | -1/+3 |
* | | | | | | Merge branch 'as/dir-c-cleanup' | Junio C Hamano | 2013-01-10 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | dir.c: rename path_excluded() to is_path_excluded() | Adam Spiers | 2012-12-28 | 2 | -2/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' | Junio C Hamano | 2013-01-10 | 2 | -7/+15 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | merge --no-edit: do not credit people involved in the side branch | Junio C Hamano | 2012-12-28 | 2 | -7/+15 |
| |/ / / / | |||||
* | | | | | Merge branch 'nd/maint-branch-desc-doc' | Junio C Hamano | 2013-01-09 | 2 | -14/+24 |
|\ \ \ \ \ | |||||
| * | | | | | format-patch: pick up branch description when no ref is specified | Nguyễn Thái Ngọc Duy | 2013-01-03 | 1 | -3/+16 |
| * | | | | | format-patch: pick up correct branch name from symbolic ref | Nguyễn Thái Ngọc Duy | 2013-01-03 | 1 | -12/+9 |
| * | | | | | branch: delete branch description if it's empty | Nguyễn Thái Ngọc Duy | 2013-01-03 | 1 | -1/+1 |
* | | | | | | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' | Junio C Hamano | 2013-01-09 | 1 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: Honor prepare-commit-msg return code | Antoine Pelisse | 2013-01-03 | 1 | -2/+3 |
* | | | | | | | Merge branch 'jc/apply-trailing-blank-removal' | Junio C Hamano | 2013-01-06 | 1 | -6/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | apply.c:update_pre_post_images(): the preimage can be truncated | Junio C Hamano | 2012-10-12 | 1 | -6/+17 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'cr/push-force-tag-update' | Junio C Hamano | 2013-01-05 | 2 | -14/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | push: allow already-exists advice to be disabled | Chris Rorvick | 2012-12-03 | 1 | -0/+2 |
| * | | | | | | | push: rename config variable for more general use | Chris Rorvick | 2012-12-03 | 1 | -3/+3 |
| * | | | | | | | push: require force for refs under refs/tags/ | Chris Rorvick | 2012-12-02 | 2 | -1/+6 |
| * | | | | | | | push: add advice for rejected tag reference | Chris Rorvick | 2012-12-02 | 1 | -0/+11 |
| * | | | | | | | push: return reject reasons as a bitset | Chris Rorvick | 2012-12-02 | 2 | -11/+6 |
* | | | | | | | | Merge branch 'fc/fast-export-fixes' | Junio C Hamano | 2013-01-05 | 1 | -8/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fast-export: make sure updated refs get updated | Felipe Contreras | 2012-12-03 | 1 | -3/+7 |
| * | | | | | | | | fast-export: don't handle uninteresting refs | Felipe Contreras | 2012-12-03 | 1 | -4/+7 |
| * | | | | | | | | fast-export: trivial cleanup | Felipe Contreras | 2012-11-29 | 1 | -1/+1 |
| * | | | | | | | | fast-export: avoid importing blob marks | Felipe Contreras | 2012-11-26 | 1 | -0/+4 |
* | | | | | | | | | Merge branch 'nd/pathspec-wildcard' | Junio C Hamano | 2013-01-05 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ |