summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/make-wildmatch-default'Junio C Hamano2013-06-201-2/+2
|\
| * Makefile: promote wildmatch to be the default fnmatch implementationNguyễn Thái Ngọc Duy2013-06-021-2/+2
* | Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-guiJunio C Hamano2013-06-168-22/+40
|\ \
| * | git-gui 0.18gitgui-0.18.0Pat Thoyts2013-06-151-1/+1
| * | git-gui: avoid an error message when removing the last remotePat Thoyts2013-06-151-2/+4
| * | git-gui: fix file name handling with non-empty prefixJohn Keeping2013-06-071-11/+3
| * | git-gui: bring wish process to front on MacStefan Haller2013-06-071-0/+14
| * | git-gui: change dialog button positions for Windows to suit platform.Pat Thoyts2013-05-171-1/+3
| * | git-gui: allow "\ No newline at end of file" for linewise stagingHeiko Voigt2013-05-161-2/+9
| * | git-gui: fix the mergetool launcher for the Beyond Compare tool.Pat Thoyts2013-02-221-2/+2
| * | Makefile: replace "echo 1>..." with "echo >..."Christian Couder2012-12-251-3/+3
| * | French translation: copy -> copie.Grahack2012-11-281-1/+1
| * | git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>Kirill Smelkov2012-11-131-0/+1
* | | Update draft release notes to 1.8.4Junio C Hamano2013-06-151-0/+17
* | | Merge branch 'rr/complete-difftool-fixup'Junio C Hamano2013-06-141-2/+2
|\ \ \
| * | | completion: show can take both revlist and pathsRamkumar Ramachandra2013-06-091-1/+1
| * | | completion: difftool takes both revs and filesRamkumar Ramachandra2013-06-031-1/+1
| | |/ | |/|
* | | 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-021-6/+16
| * | | | register_ref(): make a copy of the bad reference SHA-1Michael Haggerty2013-06-021-2/+3
| * | | | exclude_existing(): set existing_refs.strdup_stringsMichael Haggerty2013-06-021-1/+1
| * | | | string_list_add_refs_by_glob(): add a comment about memory managementMichael Haggerty2013-06-021-0/+4
| * | | | string_list_add_one_ref(): rename first parameter to "refname"Michael Haggerty2013-06-021-3/+3
| * | | | show_head_ref(): rename first parameter to "refname"Michael Haggerty2013-06-021-2/+2
| * | | | show_head_ref(): do not shadow name of argumentMichael Haggerty2013-06-021-2/+2
| * | | | add_existing(): do not retain a reference to sha1Michael Haggerty2013-06-021-3/+4
| * | | | do_fetch(): clean up existing_refs before exitingMichael Haggerty2013-06-021-5/+9
| * | | | do_fetch(): reduce scope of peer_itemMichael Haggerty2013-06-021-3/+3
| * | | | object_array_entry: fix memory handling of the name fieldMichael Haggerty2013-06-024-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