summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2013-01-20Merge branch 'rt/commit-cleanup-config'Libravatar Junio C Hamano1-1/+3
2013-01-20Merge branch 'ap/log-mailmap'Libravatar Junio C Hamano3-137/+116
2013-01-14Merge branch 'jc/blame-no-follow'Libravatar Junio C Hamano1-1/+5
2013-01-11Merge branch 'jc/merge-blobs'Libravatar Junio C Hamano2-37/+59
2013-01-11Merge branch 'jc/format-patch-reroll'Libravatar Junio C Hamano1-9/+24
2013-01-10Merge branch 'jl/interrupt-clone-remove-separate-git-dir'Libravatar Junio C Hamano1-1/+3
2013-01-10Merge branch 'as/dir-c-cleanup'Libravatar Junio C Hamano2-2/+2
2013-01-10Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Libravatar Junio C Hamano2-7/+15
2013-01-10log: add log.mailmap configuration optionLibravatar Antoine Pelisse1-0/+7
2013-01-10log: add --use-mailmap optionLibravatar Antoine Pelisse1-1/+8
2013-01-10mailmap: simplify map_user() interfaceLibravatar Antoine Pelisse2-95/+93
2013-01-10commit: make default of "cleanup" option configurableLibravatar Ralf Thielow1-1/+3
2013-01-09Merge branch 'nd/maint-branch-desc-doc'Libravatar Junio C Hamano2-14/+24
2013-01-09Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'Libravatar Junio C Hamano1-2/+3
2013-01-07Use split_ident_line to parse author and committerLibravatar Antoine Pelisse2-64/+31
2013-01-06Merge branch 'jc/apply-trailing-blank-removal'Libravatar Junio C Hamano1-6/+17
2013-01-05Merge branch 'cr/push-force-tag-update'Libravatar Junio C Hamano2-14/+27
2013-01-05Merge branch 'fc/fast-export-fixes'Libravatar Junio C Hamano1-8/+19
2013-01-05Merge branch 'nd/pathspec-wildcard'Libravatar Junio C Hamano2-2/+2
2013-01-05clone: support atomic operation with --separate-git-dirLibravatar Jens Lehmann1-1/+3
2013-01-03format-patch: give --reroll-count a short synonym -vLibravatar Junio C Hamano1-1/+1
2013-01-03merge: Honor prepare-commit-msg return codeLibravatar Antoine Pelisse1-2/+3
2013-01-03format-patch: pick up branch description when no ref is specifiedLibravatar Nguyễn Thái Ngọc Duy1-3/+16
2013-01-03format-patch: pick up correct branch name from symbolic refLibravatar Nguyễn Thái Ngọc Duy1-12/+9
2013-01-03branch: delete branch description if it's emptyLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2013-01-02Merge branch 'sp/shortlog-missing-lf'Libravatar Junio C Hamano1-3/+2
2012-12-28merge --no-edit: do not credit people involved in the side branchLibravatar Junio C Hamano2-7/+15
2012-12-28dir.c: rename path_excluded() to is_path_excluded()Libravatar Adam Spiers2-2/+2
2012-12-26merge-tree: fix d/f conflictsLibravatar Junio C Hamano1-32/+40
2012-12-26merge-tree: add comments to clarify what these functions are doingLibravatar Junio C Hamano1-4/+22
2012-12-26merge-tree: lose unused "resolve_directories"Libravatar Junio C Hamano1-3/+0
2012-12-26merge-tree: lose unused "flags" from merge_listLibravatar Junio C Hamano1-2/+1
2012-12-22format-patch: add --reroll-count=$N optionLibravatar Junio C Hamano1-0/+11
2012-12-21get_patch_filename(): split into two functionsLibravatar Junio C Hamano1-1/+3
2012-12-21get_patch_filename(): drop "just-numbers" hackLibravatar Junio C Hamano1-1/+4
2012-12-21get_patch_filename(): simplify function signatureLibravatar Junio C Hamano1-1/+1
2012-12-21builtin/log.c: stop using global patch_suffixLibravatar Junio C Hamano1-2/+2
2012-12-21builtin/log.c: drop redundant "numbered_files" parameter from make_cover_lett...Libravatar Junio C Hamano1-7/+6
2012-12-21builtin/log.c: drop unused "numbered" parameter from make_cover_letter()Libravatar Junio C Hamano1-2/+2
2012-12-13Merge branch 'maint'Libravatar Junio C Hamano1-3/+3
2012-12-13Fix sizeof usage in get_permutationsLibravatar Matthew Daley1-3/+3
2012-12-11shortlog: fix wrapping lines of wraplenLibravatar Steffen Prohaska1-3/+2
2012-12-09Which merge_file() function do you mean?Libravatar Junio C Hamano2-4/+4
2012-12-07Merge branch 'jc/same-encoding' into maintLibravatar Junio C Hamano1-1/+2
2012-12-03fast-export: make sure updated refs get updatedLibravatar Felipe Contreras1-3/+7
2012-12-03fast-export: don't handle uninteresting refsLibravatar Felipe Contreras1-4/+7
2012-12-03push: allow already-exists advice to be disabledLibravatar Chris Rorvick1-0/+2
2012-12-03push: rename config variable for more general useLibravatar Chris Rorvick1-3/+3
2012-12-02push: require force for refs under refs/tags/Libravatar Chris Rorvick2-1/+6
2012-12-02push: add advice for rejected tag referenceLibravatar Chris Rorvick1-0/+11