summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config doc: user.signingkey is also used for signed commitsnv/doc-config-signingkeyNicolas Vigier2013-10-141-5/+5
* commit: teach --gpg-sign optionJunio C Hamano2011-11-127-13/+95
* commit-tree: teach -m/-F options to read logs from elsewhereJunio C Hamano2011-11-122-6/+53
* commit-tree: update the command line parsingJunio C Hamano2011-11-091-13/+18
* commit: teach --amend to carry forward extra headersJunio C Hamano2011-11-093-3/+76
* merge: force edit and no-ff mode when merging a tag objectJunio C Hamano2011-11-091-0/+6
* commit: copy merged signed tags to headers of merge commitJunio C Hamano2011-11-093-11/+116
* merge: record tag objects without peeling in MERGE_HEADJunio C Hamano2011-11-082-4/+15
* merge: make usage of commit->util more extensibleJunio C Hamano2011-11-084-47/+61
* fmt-merge-msg: Add contents of merged tag in the merge messageJunio C Hamano2011-11-083-2/+92
* fmt-merge-msg: package options into a structureJunio C Hamano2011-11-073-18/+27
* fmt-merge-msg: avoid early returnsJunio C Hamano2011-11-071-10/+10
* refs DWIMmery: use the same rule for both "git fetch" and othersJunio C Hamano2011-11-073-12/+3
* fetch: allow "git fetch $there v1.0" to fetch a tagJunio C Hamano2011-11-071-0/+1
* merge: notice local merging of tags and keep it unwrappedJunio C Hamano2011-11-075-8/+13
* fetch: do not store peeled tag object names in FETCH_HEADLinus Torvalds2011-11-0459-176/+175
* Split GPG interface into its own helper libraryJunio C Hamano2011-11-046-100/+166
* Merge branch 'js/merge-edit-option'Junio C Hamano2011-10-193-39/+99
|\
| * Teach merge the '[-e|--edit]' optionJay Soffian2011-10-123-39/+99
* | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-196-16/+175
|\ \
| * | diff: add option to show whole functions as contextrs/diff-whole-functionRené Scharfe2011-10-106-6/+154
| * | xdiff: factor out get_func_line()René Scharfe2011-10-101-16/+27
| |/
* | Merge branch 'rs/pickaxe'Junio C Hamano2011-10-191-108/+70
|\ \
| * | pickaxe: factor out pickaxers/pickaxeRené Scharfe2011-10-071-67/+43
| * | pickaxe: give diff_grep the same signature as has_changesRené Scharfe2011-10-071-3/+4
| * | pickaxe: pass diff_options to contains and has_changesRené Scharfe2011-10-071-14/+14
| * | pickaxe: factor out has_changesRené Scharfe2011-10-071-36/+21
| * | pickaxe: plug regex/kws leakRené Scharfe2011-10-071-6/+7
| * | pickaxe: plug regex leakRené Scharfe2011-10-071-7/+6
| * | pickaxe: plug diff filespec leak with empty needleRené Scharfe2011-10-071-2/+2
| |/
* | Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-192-7/+31
|\ \
| * \ Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-062-7/+31
| |\ \
| | * | cherry-pick: do not give irrelevant advice when cherry-pick puntedjs/maint-no-cherry-pick-head-after-puntedJay Soffian2011-10-061-5/+7
| | * | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-062-2/+24
* | | | Merge branch 'bk/submodule-in-recursive-merge'Junio C Hamano2011-10-194-4/+61
|\ \ \ \
| * | | | submodule: Search for merges only at end of recursive mergeBrad King2011-10-134-5/+11
| * | | | submodule: Demonstrate known breakage during recursive mergeBrad King2011-10-131-0/+51
* | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2011-10-192-0/+46
|\ \ \ \ \
| * | | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-122-0/+46
* | | | | | Merge branch 'jk/config-test-cleanup'Junio C Hamano2011-10-191-12/+7
|\ \ \ \ \ \
| * | | | | | t1300: attempting to remove a non-existent .git/config is not an errorJohannes Sixt2011-10-191-12/+7
* | | | | | | Merge branch 'js/log-show-children'Junio C Hamano2011-10-181-0/+12
|\ \ \ \ \ \ \
| * | | | | | | log --childrenjs/log-show-childrenJay Soffian2011-10-041-0/+12
* | | | | | | | Merge branch 'cb/httpd-test-fix-port'Junio C Hamano2011-10-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | use test number as port numbercb/httpd-test-fix-portClemens Buchacher2011-10-171-1/+1
* | | | | | | | | Merge branch 'jn/gitweb-manpages'Junio C Hamano2011-10-189-479/+1649
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitweb: Add gitweb manpages to 'gitweb' package in git.specjn/gitweb-manpagesJakub Narebski2011-10-161-0/+7
| * | | | | | | | | Documentation: Add gitweb config variables to git-config(1)Jakub Narebski2011-10-161-0/+17
| * | | | | | | | | Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpagesJakub Narebski2011-10-162-0/+5
| * | | | | | | | | gitweb: Add gitweb(1) manpage for gitweb itselfJakub Narebski2011-10-165-346/+743
View Lorry Controller Status