summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-07-11t4012: modernize style for quotingLibravatar Alexander Strasser1-15/+20
2012-07-11Reduce draft release notes to 1.7.12Libravatar Junio C Hamano1-61/+0
2012-07-11Sync with 1.7.11.2Libravatar Junio C Hamano2-1/+55
2012-07-11Git 1.7.11.2Libravatar Junio C Hamano4-3/+57
2012-07-11Merge branch 'jc/maint-blame-unique-abbrev' into maintLibravatar Junio C Hamano1-4/+21
2012-07-11Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maintLibravatar Junio C Hamano2-2/+10
2012-07-11Merge branch 'th/diff-no-index-fixes' into maintLibravatar Junio C Hamano5-24/+112
2012-07-11Merge branch 'nd/clone-single-fix' into maintLibravatar Junio C Hamano2-3/+11
2012-07-11Merge branch 'jc/rev-list-simplify-merges-first-parent' into maintLibravatar Junio C Hamano1-12/+29
2012-07-11Merge branch 'hv/submodule-update-nuke-submodules' into maintLibravatar Junio C Hamano1-6/+0
2012-07-11Merge branch 'jk/diff-no-index-pager' into maintLibravatar Junio C Hamano3-15/+22
2012-07-11Merge branch 'mm/verify-filename-fix' into maintLibravatar Junio C Hamano8-10/+44
2012-07-11Merge branch 'cn/cherry-pick-range-docs' into maintLibravatar Junio C Hamano2-1/+13
2012-07-11Merge branch 'jc/ustar-checksum-is-unsigned' into maintLibravatar Junio C Hamano1-3/+3
2012-07-11Merge branch 'jc/bundle-complete-notice' into maintLibravatar Junio C Hamano1-6/+10
2012-07-11Merge branch 'jc/ls-files-i-dir' into maintLibravatar Junio C Hamano6-10/+109
2012-07-11Merge branch 'jc/request-pull-match-tagname' into maintLibravatar Junio C Hamano1-7/+22
2012-07-11cache_name_compare(): do not truncate while comparing pathsLibravatar Junio C Hamano2-4/+48
2012-07-10index-pack: loop while inflating objects in unpack_dataLibravatar Jeff King1-10/+13
2012-07-10commit: fix "--amend --only" with no pathspecLibravatar Jeff King2-1/+14
2012-07-09apply: tests for the --3way optionLibravatar Junio C Hamano1-0/+54
2012-07-09add: create ADD_EDIT.patch with mode 0666Libravatar Jeff King1-1/+1
2012-07-09filter-branch: do not forget the '@' prefix to force git-timestampLibravatar Junio C Hamano1-1/+1
2012-07-09rev-parse --disambiguate=<prefix>Libravatar Junio C Hamano5-9/+78
2012-07-09rev-parse: A and B in "rev-parse A..B" refer to committishLibravatar Junio C Hamano2-3/+3
2012-07-09reset: the command takes committishLibravatar Junio C Hamano2-3/+9
2012-07-09commit-tree: the command wants a tree and commitsLibravatar Junio C Hamano2-6/+6
2012-07-09apply: --build-fake-ancestor expects blobsLibravatar Junio C Hamano2-2/+2
2012-07-09sha1_name.c: add support for disambiguating other typesLibravatar Junio C Hamano3-5/+76
2012-07-09revision.c: the "log" family, except for "show", takes committishLibravatar Junio C Hamano4-3/+15
2012-07-09revision.c: allow handle_revision_arg() to take other flagsLibravatar Junio C Hamano3-8/+10
2012-07-09sha1_name.c: introduce get_sha1_committish()Libravatar Junio C Hamano5-7/+25
2012-07-09sha1_name.c: teach lookup context to get_sha1_with_context()Libravatar Junio C Hamano4-13/+18
2012-07-09sha1_name.c: many short names can only be committishLibravatar Junio C Hamano3-5/+30
2012-07-09sha1_name.c: get_sha1_1() takes lookup flagsLibravatar Junio C Hamano1-8/+8
2012-07-09sha1_name.c: get_describe_name() by definition groks only commitsLibravatar Junio C Hamano2-1/+257
2012-07-09rerere: make rr-cache fanout directory honor umaskLibravatar Junio C Hamano1-1/+1
2012-07-09apply: document --3way optionLibravatar Junio C Hamano1-1/+10
2012-07-09apply: allow rerere() to work on --3way resultsLibravatar Junio C Hamano2-0/+28
2012-07-09apply: register conflicted stages to the indexLibravatar Junio C Hamano2-6/+138
2012-07-09apply: --3way with add/add conflictLibravatar Junio C Hamano1-8/+62
2012-07-09apply: move verify_index_match() higherLibravatar Junio C Hamano1-10/+10
2012-07-09apply: plug the three-way merge logic inLibravatar Junio C Hamano1-3/+50
2012-07-09apply: fall back on three-way mergeLibravatar Junio C Hamano1-1/+45
2012-07-09apply: accept -3/--3way command line optionLibravatar Junio C Hamano2-2/+31
2012-07-09apply: move "already exists" logic to check_to_create()Libravatar Junio C Hamano1-11/+29
2012-07-09apply: move check_to_create_blob() closer to its sole callerLibravatar Junio C Hamano1-23/+23
2012-07-09apply: further split load_preimage()Libravatar Junio C Hamano1-19/+40
2012-07-09apply: refactor "previous patch" logicLibravatar Junio C Hamano1-26/+56
2012-07-09apply: split load_preimage() helper function outLibravatar Junio C Hamano1-3/+12