summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* string_list_add_refs_from_colon_sep(): use string_list_split()Michael Haggerty2012-11-081-13/+8
* notes: fix handling of colon-separated valuesMichael Haggerty2012-11-081-2/+2
* combine_notes_cat_sort_uniq(): sort and dedup lines all at onceMichael Haggerty2012-11-081-22/+16
* Initialize sort_uniq_list using named constantMichael Haggerty2012-11-081-1/+1
* string_list: add a function string_list_remove_empty_items()Michael Haggerty2012-11-083-1/+24
* Merge branch 'rs/branch-del-symref'Jeff King2012-10-292-26/+68
|\
| * branch: show targets of deleted symrefs, not sha1sRené Scharfe2012-10-182-11/+13
| * branch: skip commit checks when deleting symref branchesRené Scharfe2012-10-182-2/+17
| * branch: delete symref branch, not its targetRené Scharfe2012-10-182-1/+12
| * branch: factor out delete_branch_config()René Scharfe2012-10-181-5/+10
| * branch: factor out check_branch_commit()René Scharfe2012-10-181-12/+21
* | Merge branch 'nd/status-long'Jeff King2012-10-293-6/+30
|\ \
| * | status: add --long output format optionJeff King2012-10-193-6/+30
| |/
* | Merge branch 'jk/sh-setup-in-filter-branch'Jeff King2012-10-293-54/+59
|\ \
| * | filter-branch: use git-sh-setup's ident parsing functionsJeff King2012-10-192-35/+16
| * | git-sh-setup: refactor ident-parsing functionsJeff King2012-10-191-19/+43
| |/
* | Merge branch 'nd/grep-true-path'Jeff King2012-10-294-17/+51
|\ \
| * | grep: stop looking at random places for .gitattributesNguyễn Thái Ngọc Duy2012-10-124-17/+51
* | | Merge branch 'jk/maint-http-init-not-in-result-handler'Jeff King2012-10-293-14/+12
|\ \ \
| * | | http: do not set up curl auth after a 401Jeff King2012-10-123-7/+4
| * | | remote-curl: do not call run_slot repeatedlyJeff King2012-10-121-7/+8
* | | | Merge branch 'jc/grep-pcre-loose-ends'Jeff King2012-10-297-129/+225
|\ \ \ \
| * | | | log: honor grep.* configurationJunio C Hamano2012-10-101-1/+7
| * | | | log --grep: accept --basic-regexp and --perl-regexpJunio C Hamano2012-10-102-0/+14
| * | | | log --grep: use the same helper to set -E/-F options as "git grep"Junio C Hamano2012-10-102-2/+8
| * | | | revisions: initialize revs->grep_filter using grep_init()Junio C Hamano2012-10-102-2/+9
| * | | | grep: move pattern-type bits support to top-level grep.[ch]Junio C Hamano2012-10-103-39/+45
| * | | | grep: move the configuration parsing logic to grep.[ch]Junio C Hamano2012-10-103-131/+134
| * | | | builtin/grep.c: make configuration callback more reusableJunio C Hamano2012-10-101-25/+79
* | | | | Merge branch 'jl/submodule-add-by-name'Jeff King2012-10-295-14/+121
|\ \ \ \ \
| * | | | | submodule add: Fail when .git/modules/<name> already exists unless forcedJens Lehmann2012-10-013-2/+45
| * | | | | Teach "git submodule add" the --name optionJens Lehmann2012-09-304-12/+76
* | | | | | Merge branch 'jl/submodule-rm'Jeff King2012-10-295-15/+550
|\ \ \ \ \ \
| * | | | | | submodule: teach rm to remove submodules unless they contain a git directoryJens Lehmann2012-09-295-15/+550
* | | | | | | Merge branch 'jk/strbuf-detach-always-non-null'Jeff King2012-10-251-1/+3
|\ \ \ \ \ \ \
| * | | | | | | strbuf: always return a non-NULL value from strbuf_detachJeff King2012-10-181-1/+3
* | | | | | | | Merge branch 'js/mingw-fflush-errno'Jeff King2012-10-253-6/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | maybe_flush_or_die: move a too-loose Windows specific errorJohannes Sixt2012-10-173-6/+26
* | | | | | | | | Merge branch 'da/mergetools-p4'Jeff King2012-10-251-0/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mergetools/p4merge: Handle "/dev/null"David Aguilar2012-10-111-0/+25
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/test-say-color-avoid-echo-escape'Jeff King2012-10-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-lib: Fix say_color () not to interpret \a\b\c in the messageJunio C Hamano2012-10-111-1/+1
* | | | | | | | | | Merge branch 'nd/attr-match-optim'Jeff King2012-10-251-8/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | attr: avoid searching for basename on every matchNguyễn Thái Ngọc Duy2012-10-051-6/+9
| * | | | | | | | | | attr: avoid strlen() on every matchNguyễn Thái Ngọc Duy2012-10-051-2/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/peel-ref'Jeff King2012-10-255-36/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | upload-pack: use peel_ref for ref advertisementsJeff King2012-10-051-11/+3
| * | | | | | | | | | peel_ref: check object type before loadingJeff King2012-10-051-2/+9
| * | | | | | | | | | peel_ref: do not return a null sha1Jeff King2012-10-054-22/+6
| * | | | | | | | | | peel_ref: use faster deref_tag_noverifyJeff King2012-10-051-1/+1