summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-06-01silence broken link warnings with revs->ignore_missing_linksLibravatar Jeff King3-2/+17
2015-06-01add quieter versions of parse_{tree,commit}Libravatar Jeff King4-6/+16
2015-06-01completion: suggest sequencer commands for revertLibravatar Thomas Braun1-0/+5
2015-05-29glossary: add "remote", "submodule", "superproject"Libravatar Stefan Beller1-0/+16
2015-05-29setup_git_directory: delay core.bare/core.worktree errorsLibravatar Jeff King2-10/+26
2015-05-29Makefile: silence perl/PM.stamp recipeLibravatar Jeff King1-1/+1
2015-05-29Makefile: avoid timestamp updates to GIT-BUILD-OPTIONSLibravatar Jeff King1-21/+22
2015-05-29Makefile: drop dependency between git-instaweb and gitwebLibravatar Jeff King1-1/+1
2015-05-29t5520: check reflog action in fast-forward mergeLibravatar Paul Tan1-3/+10
2015-05-29t5521: test --dry-run does not make any changesLibravatar Paul Tan1-0/+13
2015-05-29t5520: test --rebase failure on unborn branch with indexLibravatar Paul Tan1-0/+15
2015-05-29t5520: test --rebase with multiple branchesLibravatar Paul Tan1-0/+9
2015-05-29t5520: test work tree fast-forward when fetch updates headLibravatar Paul Tan1-0/+21
2015-05-29t5520: test for failure if index has unresolved entriesLibravatar Paul Tan1-0/+19
2015-05-28submodule doc: reorder introductory paragraphsLibravatar Stefan Beller1-28/+22
2015-05-28Documentation: include 'merge.branchdesc' for merge and config as wellLibravatar SZEDER Gábor3-16/+12
2015-05-28xmmap(): drop "Out of memory?"Libravatar Junio C Hamano1-1/+1
2015-05-28config.c: rewrite ENODEV into EISDIR when mmap failsLibravatar Jeff King1-0/+2
2015-05-28config.c: avoid xmmap error messagesLibravatar Jeff King3-6/+21
2015-05-28config.c: fix mmap leak when writing configLibravatar Jeff King1-4/+5
2015-05-28read-cache.c: drop PROT_WRITE from mmap of indexLibravatar Jeff King1-1/+1
2015-05-27p4: retrieve the right revision of the file in UTF-16 codepathLibravatar Miguel Torroja1-1/+1
2015-05-27ref_transaction_commit(): do not capitalize error messagesLibravatar Michael Haggerty2-9/+9
2015-05-27verify_lock(): do not capitalize error messagesLibravatar Michael Haggerty1-2/+2
2015-05-27verify_lock(): report errors via a strbufLibravatar Michael Haggerty1-7/+12
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTLibravatar Jeff King4-20/+20
2015-05-27diff: accept color.diff.context as a synonym for "plain"Libravatar Jeff King2-2/+3
2015-05-27Merge branch 'nd/untracked-cache'Libravatar Junio C Hamano1-2/+6
2015-05-27t7063: hide stderr from setup inside prereqLibravatar Jeff King1-2/+6
2015-05-27t9001: write $HOME/, not ~/, to help shells without tilde expansionLibravatar Junio C Hamano1-1/+1
2015-05-27send-email: add sendmail email aliases formatLibravatar Allen Hubbe3-1/+69
2015-05-27verify_lock(): on errors, let the caller unlock the lockLibravatar Michael Haggerty1-4/+4
2015-05-27verify_lock(): return 0/-1 rather than struct ref_lock *Libravatar Michael Haggerty1-7/+14
2015-05-27clone: reorder --dissociate and --reference optionsLibravatar Jeff King1-2/+2
2015-05-27clone: use OPT_STRING_LIST for --referenceLibravatar Jeff King1-11/+2
2015-05-26diff.c: --ws-error-highlight=<kind> optionLibravatar Junio C Hamano4-16/+179
2015-05-26diff.c: add emit_del_line() and emit_context_line()Libravatar Junio C Hamano1-12/+38
2015-05-26Sync with 2.4.2Libravatar Junio C Hamano2-1/+47
2015-05-26Git 2.4.2Libravatar Junio C Hamano4-3/+49
2015-05-26Merge branch 'jk/still-interesting' into maintLibravatar Junio C Hamano1-4/+19
2015-05-26Merge branch 'jc/hash-object' into maintLibravatar Junio C Hamano5-9/+43
2015-05-26Merge branch 'jk/rebase-quiet-noop' into maintLibravatar Junio C Hamano1-1/+1
2015-05-26Merge branch 'sg/complete-decorate-full-not-long' into maintLibravatar Junio C Hamano1-1/+1
2015-05-26Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintLibravatar Junio C Hamano2-1/+19
2015-05-26Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maintLibravatar Junio C Hamano1-1/+1
2015-05-26Merge branch 'jk/stash-require-clean-index' into maintLibravatar Junio C Hamano2-7/+16
2015-05-26Merge branch 'jk/git-no-more-argv0-path-munging' into maintLibravatar Junio C Hamano1-1/+0
2015-05-26Fifth batch for 2.5 cycleLibravatar Junio C Hamano1-6/+28
2015-05-26Merge branch 'nd/untracked-cache'Libravatar Junio C Hamano21-58/+1822
2015-05-26Merge branch 'rs/plug-leak-in-pack-bitmaps'Libravatar Junio C Hamano1-5/+3