summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/fetch-pack'Junio C Hamano2015-03-253-13/+22
|\
| * fetch-pack: remove dead assignment to ref->new_sha1jk/fetch-packJeff King2015-03-191-3/+0
| * fetch_refs_via_pack: free extra copy of refsJeff King2015-03-191-3/+5
| * filter_ref: make a copy of extra "sought" entriesJeff King2015-03-192-6/+12
| * filter_ref: avoid overwriting ref->old_sha1 with garbageJeff King2015-03-191-1/+5
* | Merge branch 'jk/cleanup-failed-clone'Junio C Hamano2015-03-251-5/+6
|\ \
| * | clone: drop period from end of die_errno messagejk/cleanup-failed-cloneJeff King2015-03-191-1/+1
| * | clone: initialize atexit cleanup handler earlierJeff King2015-03-191-4/+5
* | | Merge branch 'jc/submitting-patches-mention-send-email'Junio C Hamano2015-03-251-0/+5
|\ \ \
| * | | SubmittingPatches: encourage users to use format-patch and send-emailjc/submitting-patches-mention-send-emailJunio C Hamano2015-03-151-0/+5
| |/ /
* | | Merge branch 'dj/log-graph-with-no-walk'Junio C Hamano2015-03-256-7/+23
|\ \ \
| * | | revision: forbid combining --graph and --no-walkdj/log-graph-with-no-walkDongcan Jiang2015-03-196-7/+23
* | | | Merge branch 'kd/rev-list-bisect-first-parent'Junio C Hamano2015-03-253-3/+11
|\ \ \ \
| * | | | rev-list: refuse --first-parent combined with --bisectkd/rev-list-bisect-first-parentKevin Daudt2015-03-193-3/+11
| | |/ / | |/| |
* | | | Merge branch 'ws/grep-quiet-no-pager'Junio C Hamano2015-03-251-1/+1
|\ \ \ \
| * | | | grep: fix "--quiet" overwriting current outputws/grep-quiet-no-pagerWilhelm Schuermann2015-03-191-1/+1
| |/ / /
* | | | Merge branch 'jk/simplify-csum-file-sha1fd-check'Junio C Hamano2015-03-251-7/+3
|\ \ \ \
| * | | | sha1fd_check: die when we cannot open the filejk/simplify-csum-file-sha1fd-checkJeff King2015-03-191-7/+3
| |/ / /
* | | | Merge branch 'ct/prompt-untracked-fix'Junio C Hamano2015-03-252-1/+12
|\ \ \ \
| * | | | git prompt: use toplevel to find untracked filesct/prompt-untracked-fixCody A Taylor2015-03-152-1/+12
| |/ / /
* | | | Merge branch 'master' of git://ozlabs.org/~paulus/gitkJunio C Hamano2015-03-2413-3482/+6449
|\ \ \ \
| * | | | gitk: Update .po filesPaul Mackerras2015-03-1512-3737/+5253
| * | | | gitk: l10n: Add Catalan translationAlex Henrie2015-03-151-0/+1349
| * | | | gitk: Fix typo in Russian translation0xAX2015-03-151-1/+1
| * | | | gitk: Remove tcl-format flag from a message that shouldn't have itAlex Henrie2015-03-151-0/+1
| * | | | gitk: Pass --invert-grep option down to "git log"Christoph Junghans2015-03-151-0/+1
| * | | | gitk: Synchronize config file writesMax Kirillov2015-03-151-3/+28
| * | | | gitk: Report errors in saving config fileMax Kirillov2015-03-151-1/+3
| * | | | gitk: Only write changed configuration variablesMax Kirillov2015-03-151-10/+76
| * | | | gitk: Enable mouse horizontal scrolling in diff paneGabriele Mazzotta2015-03-021-0/+7
| * | | | gitk: Default wrcomcmd to use --pretty=emailChris Packham2015-03-021-1/+1
* | | | | Sync with v2.3.4Junio C Hamano2015-03-232-1/+34
|\ \ \ \ \
| * | | | | Git 2.3.4v2.3.4Junio C Hamano2015-03-234-3/+36
| * | | | | Merge branch 'rs/use-isxdigit' into maintJunio C Hamano2015-03-232-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano2015-03-2310-13/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ak/git-done-help-cleanup' into maintJunio C Hamano2015-03-231-3/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sg/completion-remote' into maintJunio C Hamano2015-03-232-5/+21
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mg/doc-status-color-slot' into maintJunio C Hamano2015-03-232-2/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/decorate-leaky-separator-color' into maintJunio C Hamano2015-03-233-57/+84
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'kn/git-cd-to-empty' into maintJunio C Hamano2015-03-232-4/+16
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/imap-send-libcurl-options' into maintJunio C Hamano2015-03-232-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/verify-commit' into maintJunio C Hamano2015-03-231-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/rebase-i-count-todo' into maintJunio C Hamano2015-03-232-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano2015-03-233-80/+144
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #12)Junio C Hamano2015-03-231-15/+46
* | | | | | | | | | | | | | | | | Merge branch 'js/completion-ctags-pattern-substitution-fix'Junio C Hamano2015-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | contrib/completion: escape the forward slash in __git_match_ctagjs/completion-ctags-pattern-substitution-fixJohn Szakmeister2015-03-141-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/push-config'Junio C Hamano2015-03-234-9/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | push: allow --follow-tags to be set by config push.followTagsjk/push-configDave Olszewski2015-03-144-1/+21
| * | | | | | | | | | | | | | | | | cmd_push: pass "flags" pointer to config callbackJeff King2015-02-171-1/+1