summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mt/send-email-cc-match-fix'Junio C Hamano2013-06-142-8/+90
|\
| * test-send-email: test for pre-sanitized self nameMichael S. Tsirkin2013-06-051-0/+5
| * t/send-email: test suppress-cc=self with non-asciiMichael S. Tsirkin2013-06-051-0/+5
| * t/send-email: add test with quoted senderMichael S. Tsirkin2013-06-051-0/+20
| * send-email: make --suppress-cc=self sanitize inputMichael S. Tsirkin2013-06-051-8/+15
| * t/send-email: test suppress-cc=self on cccmdMichael S. Tsirkin2013-06-051-1/+3
| * send-email: fix suppress-cc=self on cccmdMichael S. Tsirkin2013-06-051-1/+1
| * t/send-email.sh: add test for suppress-cc=selfMichael S. Tsirkin2013-06-031-0/+43
* | Merge branch 'bp/mediawiki-credential'Junio C Hamano2013-06-141-57/+9
|\ \
| * | git-remote-mediawiki: use Git.pm functions for credentialsBenoit Person2013-06-051-57/+9
* | | Merge branch 'mh/reflife'Junio C Hamano2013-06-1415-121/+229
|\ \ \
| * | | refs: document the lifetime of the args passed to each_ref_fnMichael Haggerty2013-06-031-6/+16
| * | | register_ref(): make a copy of the bad reference SHA-1Michael Haggerty2013-06-031-2/+3
| * | | exclude_existing(): set existing_refs.strdup_stringsMichael Haggerty2013-06-031-1/+1
| * | | string_list_add_refs_by_glob(): add a comment about memory managementMichael Haggerty2013-06-031-0/+4
| * | | string_list_add_one_ref(): rename first parameter to "refname"Michael Haggerty2013-06-031-3/+3
| * | | show_head_ref(): rename first parameter to "refname"Michael Haggerty2013-06-031-2/+2
| * | | show_head_ref(): do not shadow name of argumentMichael Haggerty2013-06-031-2/+2
| * | | add_existing(): do not retain a reference to sha1Michael Haggerty2013-06-031-3/+4
| * | | do_fetch(): clean up existing_refs before exitingMichael Haggerty2013-06-031-5/+9
| * | | do_fetch(): reduce scope of peer_itemMichael Haggerty2013-06-031-3/+3
| * | | object_array_entry: fix memory handling of the name fieldMichael Haggerty2013-06-034-7/+35
| * | | find_first_merges(): remove unnecessary codeMichael Haggerty2013-05-281-2/+1
| * | | find_first_merges(): initialize merges variable using initializerMichael Haggerty2013-05-281-2/+1
| * | | fsck: don't put a void*-shaped peg in a char*-shaped holeMichael Haggerty2013-05-281-1/+1
| * | | object_array_remove_duplicates(): rewrite to reduce copyingMichael Haggerty2013-05-282-12/+26
| * | | revision: use object_array_filter() in implementation of gc_boundary()Michael Haggerty2013-05-281-17/+15
| * | | object_array: add function object_array_filter()Michael Haggerty2013-05-282-0/+27
| * | | revision: split some overly-long linesMichael Haggerty2013-05-282-17/+35
| * | | cmd_diff(): make it obvious which cases are exclusive of each otherMichael Haggerty2013-05-281-5/+4
| * | | cmd_diff(): rename local variable "list" -> "entry"Michael Haggerty2013-05-281-4/+4
| * | | cmd_diff(): use an object_array for holding treesMichael Haggerty2013-05-281-19/+18
| * | | builtin_diff_tree(): make it obvious that function wants two entriesMichael Haggerty2013-05-281-9/+10
| * | | add_rev_cmdline(): make a copy of the name argumentMichael Haggerty2013-05-281-1/+5
| * | | fetch: make own copies of refnamesMichael Haggerty2013-05-281-2/+2
| * | | describe: make own copy of refnameMichael Haggerty2013-05-281-2/+4
* | | | Merge branch 'kb/full-history-compute-treesame-carefully-2'Junio C Hamano2013-06-147-91/+750
|\ \ \ \
| * | | | revision.c: make default history consider bottom commitsKevin Bracey2013-05-162-7/+7
| * | | | revision.c: don't show all merges for --parentsKevin Bracey2013-05-162-9/+17
| * | | | revision.c: discount side branches when computing TREESAMEKevin Bracey2013-05-163-27/+164
| * | | | revision.c: add BOTTOM flag for commitsKevin Bracey2013-05-162-19/+18
| * | | | simplify-merges: drop merge from irrelevant side branchKevin Bracey2013-05-163-15/+47
| * | | | simplify-merges: never remove all TREESAME parentsKevin Bracey2013-05-163-3/+73
| * | | | t6012: update test for tweaked full-history traversalJunio C Hamano2013-05-161-6/+23
| * | | | revision.c: Make --full-history consider more mergesKevin Bracey2013-05-165-47/+229
| * | | | Documentation: avoid "uninteresting"Kevin Bracey2013-05-161-2/+2
| * | | | rev-list-options.txt: correct TREESAME for PKevin Bracey2013-05-161-2/+1
| * | | | t6111: add parents to testsKevin Bracey2013-05-161-19/+19
| * | | | t6111: allow checking the parents as wellJunio C Hamano2013-05-161-9/+21
| * | | | t6111: new TREESAME test setKevin Bracey2013-05-161-0/+184