summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-12-11mergetools: fix xxdiff hotkeysLibravatar David Aguilar1-5/+5
2016-12-11mingw: intercept isatty() to handle /dev/null as Git expects itLibravatar Johannes Schindelin2-0/+36
2016-12-09sequencer: remove useless get_dir() functionLibravatar Stephan Beyer1-6/+1
2016-12-09sequencer: make sequencer abort saferLibravatar Stephan Beyer2-1/+50
2016-12-09t3510: test that cherry-pick --abort does not unsafely change HEADLibravatar Stephan Beyer1-0/+10
2016-12-09commit: remove 'Clever' message for --only --amendLibravatar Andreas Krey1-2/+0
2016-12-08diff: handle --no-abbrev in no-index caseLibravatar Jack Bates8-1/+39
2016-12-08difftool: fix dir-diff index creation when in a subdirectoryLibravatar David Aguilar2-3/+45
2016-12-08am: change safe_to_abort()'s not rewinding error into a warningLibravatar Stephan Beyer1-1/+1
2016-12-08am: fix filename in safe_to_abort() error messageLibravatar Stephan Beyer1-1/+1
2016-12-07shallow.c: remove useless codeLibravatar Nguyễn Thái Ngọc Duy1-4/+0
2016-12-07shallow.c: bit manipulation tweaksLibravatar Rasmus Villemoes1-4/+4
2016-12-07shallow.c: avoid theoretical pointer wrap-aroundLibravatar Rasmus Villemoes1-1/+1
2016-12-07shallow.c: make paint_alloc slightly more robustLibravatar Nguyễn Thái Ngọc Duy1-0/+3
2016-12-07shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory poolsLibravatar Nguyễn Thái Ngọc Duy1-2/+4
2016-12-07shallow.c: rename fields in paint_info to better express their purposesLibravatar Nguyễn Thái Ngọc Duy1-9/+9
2016-12-06stash: prefer plumbing over git-diffLibravatar Jeff King2-1/+10
2016-12-06http-walker: complain about non-404 loose object errorsLibravatar Jeff King2-3/+6
2016-12-06Merge branch 'ew/http-walker' into jk/http-walker-limit-redirectLibravatar Junio C Hamano3-31/+206
2016-12-06http: treat http-alternates like redirectsLibravatar Jeff King3-3/+44
2016-12-06http: make redirects more obviousLibravatar Jeff King6-3/+81
2016-12-06remote-curl: rename shadowed options variableLibravatar Jeff King1-9/+9
2016-12-06http: always update the base URL for redirectsLibravatar Jeff King4-4/+21
2016-12-06http: simplify update_url_from_redirectLibravatar Jeff King1-6/+4
2016-12-05git-p4: fix empty file processing for large file system backend GitLFSLibravatar Lars Schneider2-12/+19
2016-12-05travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux buildLibravatar Lars Schneider1-2/+2
2016-12-05commit: make --only --allow-empty work without pathsLibravatar Andreas Krey3-2/+12
2016-12-05Sync with maint-2.10Libravatar Junio C Hamano1-0/+48
2016-12-05preparing for 2.10.3Libravatar Junio C Hamano2-1/+49
2016-12-05Merge branch 'jk/common-main' into maint-2.10Libravatar Junio C Hamano5-11/+12
2016-12-01convert: git cherry-pick -Xrenormalize did not workLibravatar Torsten Bögershausen1-6/+7
2016-12-01Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlfLibravatar Junio C Hamano2-43/+60
2016-11-29pull: fast-forward "pull --rebase=true"Libravatar Junio C Hamano2-4/+35
2016-11-29Merge branch 'tk/diffcore-delta-remove-unused' into maintLibravatar Junio C Hamano5-8/+1
2016-11-29Merge branch 'jk/create-branch-remove-unused-param' into maintLibravatar Junio C Hamano4-13/+18
2016-11-29Merge branch 'nd/worktree-lock' into maintLibravatar Junio C Hamano1-1/+1
2016-11-29Merge branch 'ps/common-info-doc' into maintLibravatar Junio C Hamano1-1/+1
2016-11-29Merge branch 'rs/cocci' into maintLibravatar Junio C Hamano1-0/+15
2016-11-29Merge branch 'nd/test-helpers' into maintLibravatar Junio C Hamano2-3/+18
2016-11-29Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maintLibravatar Junio C Hamano1-2/+2
2016-11-29Merge branch 'rs/commit-pptr-simplify' into maintLibravatar Junio C Hamano1-8/+6
2016-11-29Merge branch 'jk/rebase-config-insn-fmt-docfix' into maintLibravatar Junio C Hamano1-1/+1
2016-11-29Merge branch 'ak/pre-receive-hook-template-modefix' into maintLibravatar Junio C Hamano1-0/+0
2016-11-29Merge branch 'ls/macos-update' into maintLibravatar Junio C Hamano2-1/+3
2016-11-29Merge branch 'as/merge-attr-sleep' into maintLibravatar Junio C Hamano1-5/+13
2016-11-29Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maintLibravatar Junio C Hamano1-3/+3
2016-11-29Merge branch 'jk/daemon-path-ok-check-truncation' into maintLibravatar Junio C Hamano1-4/+21
2016-11-29Merge branch 'rs/ring-buffer-wraparound' into maintLibravatar Junio C Hamano2-2/+4
2016-11-29Merge branch 'mm/send-email-cc-cruft-after-address' into maintLibravatar Junio C Hamano3-10/+42
2016-11-29Merge branch 'cp/completion-negative-refs' into maintLibravatar Junio C Hamano1-3/+4