summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-01-23merge: use editor by default in interactive sessionsLibravatar Junio C Hamano4-9/+50
2011-12-20commit: do not lose mergetag header when not amendingLibravatar Junio C Hamano1-1/+5
2011-11-12commit-tree: teach -m/-F options to read logs from elsewhereLibravatar Junio C Hamano2-6/+53
2011-11-09commit-tree: update the command line parsingLibravatar Junio C Hamano1-13/+18
2011-11-09commit: teach --amend to carry forward extra headersLibravatar Junio C Hamano3-3/+76
2011-11-09merge: force edit and no-ff mode when merging a tag objectLibravatar Junio C Hamano1-0/+6
2011-11-09commit: copy merged signed tags to headers of merge commitLibravatar Junio C Hamano3-11/+116
2011-11-08merge: record tag objects without peeling in MERGE_HEADLibravatar Junio C Hamano2-4/+15
2011-11-08merge: make usage of commit->util more extensibleLibravatar Junio C Hamano4-47/+61
2011-11-08fmt-merge-msg: Add contents of merged tag in the merge messageLibravatar Junio C Hamano3-2/+92
2011-11-07fmt-merge-msg: package options into a structureLibravatar Junio C Hamano3-18/+27
2011-11-07fmt-merge-msg: avoid early returnsLibravatar Junio C Hamano1-10/+10
2011-11-07refs DWIMmery: use the same rule for both "git fetch" and othersLibravatar Junio C Hamano3-12/+3
2011-11-07fetch: allow "git fetch $there v1.0" to fetch a tagLibravatar Junio C Hamano1-0/+1
2011-11-07merge: notice local merging of tags and keep it unwrappedLibravatar Junio C Hamano5-8/+13
2011-11-04fetch: do not store peeled tag object names in FETCH_HEADLibravatar Linus Torvalds59-176/+175
2011-11-04Split GPG interface into its own helper libraryLibravatar Junio C Hamano6-100/+166
2011-10-19Merge branch 'js/merge-edit-option'Libravatar Junio C Hamano3-39/+99
2011-10-19Merge branch 'rs/diff-whole-function'Libravatar Junio C Hamano6-16/+175
2011-10-19Merge branch 'rs/pickaxe'Libravatar Junio C Hamano1-108/+70
2011-10-19Merge branch 'js/no-cherry-pick-head-after-punted'Libravatar Junio C Hamano2-7/+31
2011-10-19Merge branch 'bk/submodule-in-recursive-merge'Libravatar Junio C Hamano4-4/+61
2011-10-19Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Libravatar Junio C Hamano2-0/+46
2011-10-19Merge branch 'jk/config-test-cleanup'Libravatar Junio C Hamano1-12/+7
2011-10-19t1300: attempting to remove a non-existent .git/config is not an errorLibravatar Johannes Sixt1-12/+7
2011-10-18Merge branch 'js/log-show-children'Libravatar Junio C Hamano1-0/+12
2011-10-18Merge branch 'cb/httpd-test-fix-port'Libravatar Junio C Hamano1-1/+1
2011-10-18Merge branch 'jn/gitweb-manpages'Libravatar Junio C Hamano9-479/+1649
2011-10-18Merge branch 'pt/mingw-misc-fixes'Libravatar Junio C Hamano8-29/+41
2011-10-18Merge branch 'md/smtp-tls-hello-again'Libravatar Junio C Hamano1-1/+1
2011-10-18Merge branch 'maint'Libravatar Junio C Hamano1-1/+0
2011-10-18strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()Libravatar Brandon Casey1-1/+0
2011-10-17Update draft release notes to 1.7.8Libravatar Junio C Hamano1-1/+37
2011-10-17Merge branch 'jk/http-auth'Libravatar Junio C Hamano9-69/+130
2011-10-17Merge branch 'js/check-ref-format-test-mingw'Libravatar Junio C Hamano1-36/+52
2011-10-17Merge branch 'jk/pull-rebase-with-work-tree'Libravatar Junio C Hamano2-2/+2
2011-10-17Merge branch 'jk/config-test-cleanup'Libravatar Junio C Hamano1-83/+120
2011-10-17Merge branch 'bc/attr-ignore-case'Libravatar Junio C Hamano10-34/+90
2011-10-17Merge branch 'sg/completion'Libravatar Junio C Hamano1-18/+6
2011-10-17Merge branch 'mm/maint-config-explicit-bool-display'Libravatar Junio C Hamano2-7/+19
2011-10-17Merge branch 'tc/fetch-leak'Libravatar Junio C Hamano1-4/+9
2011-10-17Merge branch 'jk/name-hash-dirent'Libravatar Junio C Hamano2-7/+9
2011-10-17Merge branch 'ef/mingw-syslog'Libravatar Junio C Hamano1-12/+18
2011-10-17Merge branch 'tm/completion-push-set-upstream'Libravatar Junio C Hamano1-1/+1
2011-10-17Merge branch 'tm/completion-commit-fixup-squash'Libravatar Junio C Hamano1-7/+4
2011-10-17Merge branch 'ph/push-to-delete-nothing'Libravatar Junio C Hamano2-8/+215
2011-10-17Merge branch 'jc/checkout-from-tree-keep-local-changes'Libravatar Junio C Hamano2-1/+47
2011-10-17Merge branch 'js/bisect-no-checkout'Libravatar Junio C Hamano1-1/+2
2011-10-17use test number as port numberLibravatar Clemens Buchacher1-1/+1
2011-10-17resolve_gitlink_packed_ref(): fix mismergeLibravatar Junio C Hamano2-1/+30