aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'rs/branch-del-symref'Jeff King2012-10-29
|\
| * branch: show targets of deleted symrefs, not sha1sRené Scharfe2012-10-18
| * branch: skip commit checks when deleting symref branchesRené Scharfe2012-10-18
| * branch: delete symref branch, not its targetRené Scharfe2012-10-18
| * branch: factor out delete_branch_config()René Scharfe2012-10-18
| * branch: factor out check_branch_commit()René Scharfe2012-10-18
* | Merge branch 'nd/status-long'Jeff King2012-10-29
|\ \
| * | status: add --long output format optionJeff King2012-10-18
| |/
* | Merge branch 'jk/sh-setup-in-filter-branch'Jeff King2012-10-29
|\ \
| * | filter-branch: use git-sh-setup's ident parsing functionsJeff King2012-10-18
| * | git-sh-setup: refactor ident-parsing functionsJeff King2012-10-18
| |/
* | Merge branch 'nd/grep-true-path'Jeff King2012-10-29
|\ \
| * | grep: stop looking at random places for .gitattributesNguyễn Thái Ngọc Duy2012-10-12
* | | Merge branch 'jk/maint-http-init-not-in-result-handler'Jeff King2012-10-29
|\ \ \
| * | | http: do not set up curl auth after a 401Jeff King2012-10-12
| * | | remote-curl: do not call run_slot repeatedlyJeff King2012-10-12
* | | | Merge branch 'jc/grep-pcre-loose-ends'Jeff King2012-10-29
|\ \ \ \
| * | | | log: honor grep.* configurationJunio C Hamano2012-10-09
| * | | | log --grep: accept --basic-regexp and --perl-regexpJunio C Hamano2012-10-09
| * | | | log --grep: use the same helper to set -E/-F options as "git grep"Junio C Hamano2012-10-09
| * | | | revisions: initialize revs->grep_filter using grep_init()Junio C Hamano2012-10-09
| * | | | grep: move pattern-type bits support to top-level grep.[ch]Junio C Hamano2012-10-09
| * | | | grep: move the configuration parsing logic to grep.[ch]Junio C Hamano2012-10-09
| * | | | builtin/grep.c: make configuration callback more reusableJunio C Hamano2012-10-09
* | | | | Merge branch 'jl/submodule-add-by-name'Jeff King2012-10-29
|\ \ \ \ \
| * | | | | submodule add: Fail when .git/modules/<name> already exists unless forcedJens Lehmann2012-09-30
| * | | | | Teach "git submodule add" the --name optionJens Lehmann2012-09-29
* | | | | | Merge branch 'jl/submodule-rm'Jeff King2012-10-29
|\ \ \ \ \ \
| * | | | | | submodule: teach rm to remove submodules unless they contain a git directoryJens Lehmann2012-09-29
* | | | | | | Merge branch 'jk/strbuf-detach-always-non-null'Jeff King2012-10-25
|\ \ \ \ \ \ \
| * | | | | | | strbuf: always return a non-NULL value from strbuf_detachJeff King2012-10-18
* | | | | | | | Merge branch 'js/mingw-fflush-errno'Jeff King2012-10-25
|\ \ \ \ \ \ \ \
| * | | | | | | | maybe_flush_or_die: move a too-loose Windows specific errorJohannes Sixt2012-10-17
* | | | | | | | | Merge branch 'da/mergetools-p4'Jeff King2012-10-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mergetools/p4merge: Handle "/dev/null"David Aguilar2012-10-11
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/test-say-color-avoid-echo-escape'Jeff King2012-10-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-lib: Fix say_color () not to interpret \a\b\c in the messageJunio C Hamano2012-10-11
* | | | | | | | | | Merge branch 'nd/attr-match-optim'Jeff King2012-10-25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | attr: avoid searching for basename on every matchNguyễn Thái Ngọc Duy2012-10-05
| * | | | | | | | | | attr: avoid strlen() on every matchNguyễn Thái Ngọc Duy2012-10-05
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/peel-ref'Jeff King2012-10-25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | upload-pack: use peel_ref for ref advertisementsJeff King2012-10-04
| * | | | | | | | | | peel_ref: check object type before loadingJeff King2012-10-04
| * | | | | | | | | | peel_ref: do not return a null sha1Jeff King2012-10-04
| * | | | | | | | | | peel_ref: use faster deref_tag_noverifyJeff King2012-10-04
* | | | | | | | | | | Merge branch 'bw/config-lift-variable-name-length-limit'Jeff King2012-10-25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove the hard coded length limit on variable names in config filesBen Walton2012-10-01
* | | | | | | | | | | | Merge branch 'fa/remote-svn'Jeff King2012-10-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add a test script for remote-svnFlorian Achleitner2012-10-07
| * | | | | | | | | | | | remote-svn: add marks-file regenerationFlorian Achleitner2012-10-07