summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sv/doc-stripspace'Junio C Hamano2014-12-221-0/+1
|\
| * Documentation/git-stripspace: add synopsis for --comment-linessv/doc-stripspaceSlavomir Vlcek2014-12-041-0/+1
* | Merge branch 'rt/completion-tag'Junio C Hamano2014-12-221-0/+10
|\ \
| * | completion: add git-tag optionsrt/completion-tagRalf Thielow2014-12-041-0/+10
* | | Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored'Junio C Hamano2014-12-221-0/+3
|\ \ \
| * | | check-ignore: clarify treatment of tracked filesmg/doc-check-ignore-tracked-are-not-ignoredMichael J Gruber2014-12-041-0/+3
| |/ /
* | | Merge branch 'jk/credential-quit'Junio C Hamano2014-12-226-5/+35
|\ \ \
| * | | prompt: respect GIT_TERMINAL_PROMPT to disable terminal promptsjk/credential-quitJeff King2014-12-042-4/+16
| * | | credential: let helpers tell us to quitJeff King2014-12-044-1/+19
| |/ /
* | | Merge branch 'dm/compat-s-ifmt-for-zos'Junio C Hamano2014-12-225-7/+113
|\ \ \
| * | | compat: convert modes to use portable file type valuesdm/compat-s-ifmt-for-zosDavid Michael2014-12-045-7/+113
| |/ /
* | | Merge branch 'ps/new-workdir-into-empty-directory'Junio C Hamano2014-12-221-15/+38
|\ \ \
| * | | git-new-workdir: don't fail if the target directory is emptyps/new-workdir-into-empty-directoryPaul Smith2014-12-031-15/+38
* | | | Merge branch 'nd/ls-tree-pathspec'Junio C Hamano2014-12-2210-69/+74
|\ \ \ \
| * | | | t3102: style modernizationnd/ls-tree-pathspecJunio C Hamano2014-12-011-8/+8
| * | | | t3102: document that ls-tree does not yet support negated pathspecJunio C Hamano2014-12-011-0/+6
| * | | | ls-tree: disable negative pathspec because it's not supportedNguyễn Thái Ngọc Duy2014-12-011-1/+2
| * | | | ls-tree: remove path filtering logic in show_treeNguyễn Thái Ngọc Duy2014-12-014-30/+15
| * | | | tree.c: update read_tree_recursive callback to pass strbuf as baseNguyễn Thái Ngọc Duy2014-12-017-37/+50
* | | | | Merge branch 'jc/hook-cleanup'Junio C Hamano2014-12-222-21/+0
|\ \ \ \ \
| * | | | | run-command.c: retire unused run_hook_with_custom_index()jc/hook-cleanupJunio C Hamano2014-12-012-21/+0
| | |_|/ / | |/| | |
* | | | | Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \
| * | | | | for-each-ref: correct spelling of Tcl in option descriptionrt/for-each-ref-spell-tcl-as-TclRalf Thielow2014-11-301-1/+1
| |/ / / /
* | | | | Merge branch 'rj/t0050-passes'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \
| * | | | | t0050-*.sh: mark the rename (case change) test as passingrj/t0050-passesRamsay Jones2014-11-301-1/+1
* | | | | | Merge branch 'js/push-to-deploy'Junio C Hamano2014-12-223-2/+202
|\ \ \ \ \ \
| * | | | | | t5516: more tests for receive.denyCurrentBranch=updateInsteadjs/push-to-updatejs/push-to-deployJunio C Hamano2014-11-301-9/+87
| * | | | | | receive-pack: add another option for receive.denyCurrentBranchJohannes Schindelin2014-11-303-2/+124
* | | | | | | Merge branch 'jc/exec-cmd-system-path-leak-fix'Junio C Hamano2014-12-224-12/+21
|\ \ \ \ \ \ \
| * | | | | | | system_path(): always return free'able memory to the callerjc/exec-cmd-system-path-leak-fixJunio C Hamano2014-11-304-12/+21
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'mh/find-uniq-abbrev'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrevmh/find-uniq-abbrevMike Hommey2014-11-261-1/+1
* | | | | | | | Merge branch 'pb/send-email-te'Junio C Hamano2014-12-225-6/+227
|\ \ \ \ \ \ \ \
| * | | | | | | | git-send-email: add --transfer-encoding optionpb/send-email-tePaolo Bonzini2014-11-255-0/+208
| * | | | | | | | git-send-email: delay creation of MIME headersPaolo Bonzini2014-11-251-6/+19
* | | | | | | | | Merge branch 'pb/am-message-id-footer'Junio C Hamano2014-12-229-3/+126
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-am: add --message-id/--no-message-idpb/am-message-id-footerPaolo Bonzini2014-11-253-2/+53
| * | | | | | | | | git-mailinfo: add --message-idPaolo Bonzini2014-11-256-1/+73
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mh/simplify-repack-without-refs'Junio C Hamano2014-12-2213-70/+75
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sort_string_list(): rename to string_list_sort()mh/simplify-repack-without-refsMichael Haggerty2014-11-2511-20/+20
| * | | | | | | | | prune_remote(): iterate using for_each_string_list_item()Michael Haggerty2014-11-251-8/+6
| * | | | | | | | | prune_remote(): rename local variableMichael Haggerty2014-11-251-6/+6
| * | | | | | | | | repack_without_refs(): make the refnames argument a string_listMichael Haggerty2014-11-253-31/+31
| * | | | | | | | | prune_remote(): sort delete_refs_list references en masseMichael Haggerty2014-11-251-1/+2
| * | | | | | | | | prune_remote(): initialize both delete_refs lists in a single loopMichael Haggerty2014-11-251-6/+9
| * | | | | | | | | prune_remote(): exit early if there are no stale referencesMichael Haggerty2014-11-251-18/+21
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'dw/shell-basename-dashdash-before-stripping-leading-dash-from-l...Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-sh-setup.sh: use dashdash with basename calldw/shell-basename-dashdash-before-stripping-leading-dash-from-loginDan Wyand2014-11-251-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rj/no-xopen-source-for-cygwin'Junio C Hamano2014-12-221-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-compat-util.h: don't define _XOPEN_SOURCE on cygwinRamsay Jones2014-11-241-1/+2
| |/ / / / / / / /