summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy2013-04-182-2/+2
* Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-04-181-13/+13
|\
| * merge-tree: don't print entries that match "local"John Keeping2013-04-081-13/+13
* | Merge branch 'fc/send-email-annotate'Junio C Hamano2013-04-181-81/+85
|\ \
| * | format-patch: trivial cleanupsFelipe Contreras2013-04-071-36/+35
| * | format-patch: add format.coverLetter configuration variableFelipe Contreras2013-04-071-6/+26
| * | log: update to OPT_BOOLFelipe Contreras2013-04-071-7/+7
| * | format-patch: refactor branch name calculationFelipe Contreras2013-04-071-17/+16
| * | format-patch: improve head calculation for cover-letterFelipe Contreras2013-04-071-18/+4
* | | Merge branch 'kb/co-orphan-suggestion-short-sha1'Junio C Hamano2013-04-181-1/+1
|\ \ \
| * | | checkout: abbreviate hash in suggest_reattachKevin Bracey2013-04-081-1/+1
* | | | Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano2013-04-151-7/+11
|\ \ \ \
| * | | | fmt-merge-msg: use core.commentchar in tag signatures completelyRalf Thielow2013-04-071-4/+8
| * | | | fmt-merge-msg: respect core.commentchar in people creditsRalf Thielow2013-04-071-3/+3
* | | | | Merge branch 'jk/show-branch-strbuf'Junio C Hamano2013-04-151-9/+8
|\ \ \ \ \
| * | | | | show-branch: use strbuf instead of static bufferJeff King2013-04-061-9/+8
* | | | | | Merge branch 'po/help-guides'Junio C Hamano2013-04-141-7/+7
|\ \ \ \ \ \
| * | | | | | help: mark common_guides[] as translatableSimon Ruderich2013-04-121-7/+7
* | | | | | | Sync with 'maint'Junio C Hamano2013-04-122-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-121-3/+3
| * | | | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-04-121-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | fast-export: fix argument name in error messagesPaul Price2013-04-121-2/+2
| * | | | | | | | Merge branch 'nd/index-pack-threaded-fixes' into maintJunio C Hamano2013-04-041-8/+26
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-correct-depth-fix' into maintJunio C Hamano2013-04-041-0/+2
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'po/help-guides'Junio C Hamano2013-04-111-2/+44
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | / / / | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | builtin/help.c: add list_common_guides_help() functionPhilip Oakley2013-04-021-3/+33
| * | | | | | | | | builtin/help.c: add --guide optionPhilip Oakley2013-04-021-2/+8
| * | | | | | | | | builtin/help.c: split "-a" processing into twoPhilip Oakley2013-04-021-1/+7
* | | | | | | | | | Merge branch 'jk/rm-removed-paths'Junio C Hamano2013-04-071-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rm: do not complain about d/f conflicts during deletionJeff King2013-04-041-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'mg/gpg-interface-using-status' into maintJunio C Hamano2013-04-032-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bc/commit-complete-lines-given-via-m-option' into maintJunio C Hamano2013-04-031-1/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/describe' into maintJunio C Hamano2013-04-031-21/+20
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/tag-force-no-warn-on-creation' into maintJunio C Hamano2013-04-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Sync with 1.8.1 maintenance trackJunio C Hamano2013-04-032-6/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1Junio C Hamano2013-04-032-6/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1Junio C Hamano2013-04-031-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1Junio C Hamano2013-04-031-4/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rr/triangle'Junio C Hamano2013-04-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | remote.c: introduce a way to have different remotes for fetch/pushRamkumar Ramachandra2013-04-021-1/+1
* | | | | | | | | | | | | | | | | fast-export: Allow pruned-references in mark fileAntoine Pelisse2013-04-071-4/+7
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'sg/gpg-sig'Junio C Hamano2013-04-051-1/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | merge/pull Check for untrusted good GPG signaturesSebastian Götte2013-03-311-0/+3
| * | | | | | | | | | | | | | | | merge/pull: verify GPG signatures of commits being mergedSebastian Götte2013-03-311-1/+33
* | | | | | | | | | | | | | | | | Merge branch 'jc/merge-tag-object'Junio C Hamano2013-04-051-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | merge: a random object may not necssarily be a commitJunio C Hamano2013-03-191-0/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jm/branch-rename-nothing-error'Junio C Hamano2013-04-031-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | branch: give better message when no names specified for renameJonathon Mah2013-03-311-1/+3
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/check-corrupt-objects-carefully'Junio C Hamano2013-04-031-2/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | clone: leave repo in place after checkout errorsJeff King2013-03-291-1/+24
View Lorry Controller Status