summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-06-18pull: remove redirection to git-pull.shLibravatar Paul Tan3-8/+0
2015-06-18pull --rebase: error on no merge candidate casesLibravatar Paul Tan1-3/+12
2015-06-18pull --rebase: exit early when the working directory is dirtyLibravatar Paul Tan1-1/+76
2015-06-18pull: configure --rebase via branch.<name>.rebase or pull.rebaseLibravatar Paul Tan1-1/+34
2015-06-18pull: teach git pull about --rebaseLibravatar Paul Tan1-2/+245
2015-06-18pull: set reflog messageLibravatar Paul Tan1-0/+22
2015-06-18pull: implement pulling into an unborn branchLibravatar Paul Tan1-1/+28
2015-06-18pull: fast-forward working tree if head is updatedLibravatar Paul Tan1-0/+30
2015-06-18pull: check if in unresolved merge stateLibravatar Paul Tan3-0/+18
2015-06-18pull: support pull.ff configLibravatar Paul Tan1-0/+29
2015-06-18pull: error on no merge candidatesLibravatar Paul Tan1-0/+113
2015-06-18pull: pass git-fetch's options to git-fetchLibravatar Paul Tan1-0/+95
2015-06-18git-multimail: update to release 1.1.0Libravatar Matthieu Moy6-326/+1017
2015-06-17test-lib.sh: fix color support when tput needs ~/.terminfoLibravatar Richard Hansen1-29/+28
2015-06-17docs: clarify that --encoding can produce invalid sequencesLibravatar Jeff King1-1/+4
2015-06-17git-checkout.txt: document "git checkout <pathspec>" betterLibravatar Torsten Bögershausen1-1/+5
2015-06-17Revert "test-lib.sh: do tests for color support after changing HOME"Libravatar Richard Hansen1-47/+43
2015-06-17fetch-pack: check for shallow if depth givenLibravatar Mike Edgar1-1/+1
2015-06-16Eighth batch for 2.5Libravatar Junio C Hamano1-1/+11
2015-06-16Sync with 2.4.4Libravatar Junio C Hamano3-6/+42
2015-06-16Git 2.4.4Libravatar Junio C Hamano4-3/+39
2015-06-16Merge branch 'jk/clone-dissociate' into maintLibravatar Junio C Hamano1-13/+4
2015-06-16Merge branch 'sb/submodule-doc-intro' into maintLibravatar Junio C Hamano1-28/+22
2015-06-16Merge branch 'sb/glossary-submodule' into maintLibravatar Junio C Hamano1-0/+16
2015-06-16Merge branch 'ah/usage-strings' into maintLibravatar Junio C Hamano2-2/+2
2015-06-16Merge branch 'mc/commit-doc-grammofix' into maintLibravatar Junio C Hamano1-1/+1
2015-06-16Merge branch 'rs/janitorial' into maintLibravatar Junio C Hamano7-26/+9
2015-06-16Merge branch 'sb/test-bitmap-free-at-end' into maintLibravatar Junio C Hamano1-1/+1
2015-06-16Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintLibravatar Junio C Hamano1-3/+3
2015-06-16Merge branch 'jk/http-backend-deadlock' into maintLibravatar Junio C Hamano3-29/+139
2015-06-16Merge branch 'jh/filter-empty-contents' into maintLibravatar Junio C Hamano2-1/+27
2015-06-16Merge branch 'jk/stash-options' into maintLibravatar Junio C Hamano2-1/+20
2015-06-16Merge branch 'mm/log-format-raw-doc' into maintLibravatar Junio C Hamano2-2/+14
2015-06-16Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maintLibravatar Junio C Hamano1-1/+53
2015-06-16Merge branch 'nd/slim-index-pack-memory-usage'Libravatar Junio C Hamano1-2/+6
2015-06-16Merge branch 'sb/pack-protocol-mention-smart-http'Libravatar Junio C Hamano1-3/+3
2015-06-16Merge branch 'jk/make-fix-dependencies'Libravatar Junio C Hamano1-24/+25
2015-06-16Merge branch 'jk/die-on-bogus-worktree-late'Libravatar Junio C Hamano2-10/+26
2015-06-16Merge branch 'sg/merge-summary-config'Libravatar Junio C Hamano3-16/+12
2015-06-16Merge branch 'ah/send-email-sendmail-alias'Libravatar Junio C Hamano3-2/+70
2015-06-16pkt-line: support tracing verbatim pack contentsLibravatar Jeff King5-16/+71
2015-06-16Documentation/describe: improve one-line summaryLibravatar Matthieu Moy1-1/+1
2015-06-15pkt-line: tighten sideband PACK check when tracingLibravatar Jeff King1-1/+1
2015-06-15pkt-line: simplify starts_with checks in packet tracingLibravatar Jeff King1-2/+1
2015-06-15clean: improve performance when removing lots of directoriesLibravatar Erik Elfström2-10/+30
2015-06-15p7300: add performance tests for cleanLibravatar Erik Elfström1-0/+31
2015-06-15t7300: add tests to document behavior of clean and nested gitLibravatar Erik Elfström1-0/+142
2015-06-15setup: sanity check file size in read_gitfile_gentlyLibravatar Erik Elfström2-0/+8
2015-06-15Revert "stash: require a clean index to apply"Libravatar Jeff King2-9/+0
2015-06-15pull: pass git-merge's options to git-mergeLibravatar Paul Tan1-0/+75