summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/merge-blobs'Junio C Hamano2013-01-112-37/+59
|\
| * merge-tree: fix d/f conflictsJunio C Hamano2012-12-261-32/+40
| * merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-261-4/+22
| * merge-tree: lose unused "resolve_directories"Junio C Hamano2012-12-261-3/+0
| * merge-tree: lose unused "flags" from merge_listJunio C Hamano2012-12-261-2/+1
| * Which merge_file() function do you mean?Junio C Hamano2012-12-092-4/+4
* | Merge branch 'jc/format-patch-reroll'Junio C Hamano2013-01-111-9/+24
|\ \
| * | format-patch: give --reroll-count a short synonym -vJunio C Hamano2013-01-031-1/+1
| * | format-patch: add --reroll-count=$N optionJunio C Hamano2012-12-221-0/+11
| * | get_patch_filename(): split into two functionsJunio C Hamano2012-12-211-1/+3
| * | get_patch_filename(): drop "just-numbers" hackJunio C Hamano2012-12-211-1/+4
| * | get_patch_filename(): simplify function signatureJunio C Hamano2012-12-211-1/+1
| * | builtin/log.c: stop using global patch_suffixJunio C Hamano2012-12-211-2/+2
| * | builtin/log.c: drop redundant "numbered_files" parameter from make_cover_lett...Junio C Hamano2012-12-211-7/+6
| * | builtin/log.c: drop unused "numbered" parameter from make_cover_letter()Junio C Hamano2012-12-211-2/+2
* | | Merge branch 'jl/interrupt-clone-remove-separate-git-dir'Junio C Hamano2013-01-101-1/+3
|\ \ \
| * | | clone: support atomic operation with --separate-git-dirJens Lehmann2013-01-051-1/+3
* | | | Merge branch 'as/dir-c-cleanup'Junio C Hamano2013-01-102-2/+2
|\ \ \ \
| * | | | dir.c: rename path_excluded() to is_path_excluded()Adam Spiers2012-12-282-2/+2
* | | | | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Junio C Hamano2013-01-102-7/+15
|\ \ \ \ \
| * | | | | merge --no-edit: do not credit people involved in the side branchJunio C Hamano2012-12-282-7/+15
| |/ / / /
* | | | | Merge branch 'nd/maint-branch-desc-doc'Junio C Hamano2013-01-092-14/+24
|\ \ \ \ \
| * | | | | format-patch: pick up branch description when no ref is specifiedNguyễn Thái Ngọc Duy2013-01-031-3/+16
| * | | | | format-patch: pick up correct branch name from symbolic refNguyễn Thái Ngọc Duy2013-01-031-12/+9
| * | | | | branch: delete branch description if it's emptyNguyễn Thái Ngọc Duy2013-01-031-1/+1
* | | | | | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'Junio C Hamano2013-01-091-2/+3
|\ \ \ \ \ \
| * | | | | | merge: Honor prepare-commit-msg return codeAntoine Pelisse2013-01-031-2/+3
* | | | | | | Merge branch 'jc/apply-trailing-blank-removal'Junio C Hamano2013-01-061-6/+17
|\ \ \ \ \ \ \
| * | | | | | | apply.c:update_pre_post_images(): the preimage can be truncatedJunio C Hamano2012-10-121-6/+17
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-052-14/+27
|\ \ \ \ \ \ \
| * | | | | | | push: allow already-exists advice to be disabledChris Rorvick2012-12-031-0/+2
| * | | | | | | push: rename config variable for more general useChris Rorvick2012-12-031-3/+3
| * | | | | | | push: require force for refs under refs/tags/Chris Rorvick2012-12-022-1/+6
| * | | | | | | push: add advice for rejected tag referenceChris Rorvick2012-12-021-0/+11
| * | | | | | | push: return reject reasons as a bitsetChris Rorvick2012-12-022-11/+6
* | | | | | | | Merge branch 'fc/fast-export-fixes'Junio C Hamano2013-01-051-8/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | fast-export: make sure updated refs get updatedFelipe Contreras2012-12-031-3/+7
| * | | | | | | | fast-export: don't handle uninteresting refsFelipe Contreras2012-12-031-4/+7
| * | | | | | | | fast-export: trivial cleanupFelipe Contreras2012-11-291-1/+1
| * | | | | | | | fast-export: avoid importing blob marksFelipe Contreras2012-11-261-0/+4
* | | | | | | | | Merge branch 'nd/pathspec-wildcard'Junio C Hamano2013-01-052-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pathspec: save the non-wildcard length partNguyễn Thái Ngọc Duy2012-11-192-2/+2
* | | | | | | | | | Merge branch 'sp/shortlog-missing-lf'Junio C Hamano2013-01-021-3/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | shortlog: fix wrapping lines of wraplenSteffen Prohaska2012-12-111-3/+2
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-12-131-3/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix sizeof usage in get_permutationsMatthew Daley2012-12-131-3/+3
| * | | | | | | | Merge branch 'jc/same-encoding' into maintJunio C Hamano2012-12-071-1/+2
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'jk/send-email-sender-prompt'Junio C Hamano2012-11-291-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ident: keep separate "explicit" flags for author and committerJeff King2012-11-151-2/+2
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jl/submodule-rm'Junio C Hamano2012-11-291-0/+15
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status