summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge: deprecate 'git merge <message> HEAD <commit>' syntaxjc/merge-deprecate-old-syntaxJunio C Hamano2015-03-267-8/+9
* Getting ready for -rc0Junio C Hamano2015-03-251-0/+52
* Merge branch 'nd/doc-git-index-version'Junio C Hamano2015-03-251-1/+2
|\
| * git.txt: list index versions in plain Englishnd/doc-git-index-versionNguyễn Thái Ngọc Duy2015-03-241-1/+2
* | Merge branch 'jk/run-command-capture'Junio C Hamano2015-03-255-24/+44
|\ \
| * | run-command: forbid using run_command with piped outputjk/run-command-captureJeff King2015-03-221-1/+6
| * | trailer: use capture_commandJeff King2015-03-221-13/+5
| * | submodule: use capture_commandJeff King2015-03-221-3/+1
| * | wt-status: use capture_commandJeff King2015-03-221-4/+1
| * | run-command: introduce capture_command helperJeff King2015-03-222-0/+29
| * | wt_status: fix signedness mismatch in strbuf_read callJeff King2015-03-221-3/+3
| * | wt-status: don't flush before running "submodule status"Jeff King2015-03-221-1/+0
* | | Merge branch 'tg/test-index-v4'Junio C Hamano2015-03-251-3/+12
|\ \ \
| * | | t1700: make test pass with index-v4tg/test-index-v4Thomas Gummerer2015-03-201-3/+12
* | | | Merge branch 'jk/prune-with-corrupt-refs'Junio C Hamano2015-03-257-68/+147
|\ \ \ \
| * | | | refs.c: drop curate_packed_refsjk/prune-with-corrupt-refsJeff King2015-03-202-67/+2
| * | | | repack: turn on "ref paranoia" when doing a destructive repackJeff King2015-03-202-3/+7
| * | | | prune: turn on ref_paranoia flagJeff King2015-03-202-2/+3
| * | | | refs: introduce a "ref paranoia" flagJeff King2015-03-204-0/+25
| * | | | t5312: test object deletion code paths in a corrupted repositoryJeff King2015-03-201-0/+114
| | |/ / | |/| |
* | | | Merge branch 'tg/fix-check-order-with-split-index'Junio C Hamano2015-03-251-19/+23
|\ \ \ \
| * | | | read-cache: fix reading of split indextg/fix-check-order-with-split-indexThomas Gummerer2015-03-201-19/+23
| | |/ / | |/| |
* | | | 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
View Lorry Controller Status