summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | refs.c: spell NULL pointer as NULLRamsay Jones2013-10-141-1/+1
* | | | | | | | | | | | | | | | | | config.c: mark file-local function staticRamsay Jones2013-10-141-1/+1
* | | | | | | | | | | | | | | | | | CodingGuidelines: style for multi-line commentsbrian m. carlson2013-10-141-0/+8
* | | | | | | | | | | | | | | | | | Merge branch 'nv/doc-config-signingkey'Jonathan Nieder2013-10-141-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | config doc: user.signingkey is also used for signed commitsnv/doc-config-signingkeyNicolas Vigier2013-10-141-5/+5
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/checkout-test-complex-path'Jonathan Nieder2013-10-141-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | checkout test: enable test with complex relative pathsb/checkout-test-complex-pathStefan Beller2013-10-091-7/+7
* | | | | | | | | | | | | | | | | | | | Merge branch 'rt/cherry-pick-status'Jonathan Nieder2013-10-143-11/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | status: show commit sha1 in "You are currently cherry-picking" messagert/cherry-pick-statusRalf Thielow2013-10-113-6/+12
| * | | | | | | | | | | | | | | | | | | | status test: add missing && to <<EOF blocksJonathan Nieder2013-10-111-5/+5
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'rj/doc-formatting-fix'Jonathan Nieder2013-10-142-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | howto/revert-a-faulty-merge: fix unescaped '^'srj/doc-formatting-fixRamsay Jones2013-10-141-4/+4
| * | | | | | | | | | | | | | | | | | | | howto/setup-git-server-over-http: fix unescaped '^'sRamsay Jones2013-10-141-2/+2
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'po/remote-set-head-usage'Jonathan Nieder2013-10-142-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | remote set-head -h: add long options to synopsispo/remote-set-head-usagePhilip Oakley2013-09-271-2/+2
| * | | | | | | | | | | | | | | | | | | | remote doc: document long forms of set-head optionsPhilip Oakley2013-09-271-3/+3
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/clone-local-with-colon'Jonathan Nieder2013-10-142-2/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | clone: tighten "local paths with colons" check a bitnd/clone-local-with-colonNguyễn Thái Ngọc Duy2013-09-272-2/+46
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jx/clean-interactive'Jonathan Nieder2013-10-142-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | path-utils test: rename mingw_path function to print_pathjx/clean-interactiveSebastian Schuberth2013-10-142-3/+3
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-algo'Jonathan Nieder2013-10-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | merge-recursive: fix parsing of "diff-algorithm" optionjk/diff-algoJohn Keeping2013-09-261-2/+2
* | | | | | | | | | | | | | | | | | | | | | | mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen2013-10-133-2/+18
* | | | | | | | | | | | | | | | | | | | | | | .mailmap: switch to Thomas Rast's personal addressThomas Rast2013-10-131-1/+3
| |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'tz/credential-netrc'Jonathan Nieder2013-10-081-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | git-credential-netrc: fix uninitialized warningtz/credential-netrcTed Zlatanov2013-10-081-1/+3
* | | | | | | | | | | | | | | | | | | | | | | Documentation/Makefile: make AsciiDoc dblatex dir configurableJohn Keeping2013-10-031-1/+2
* | | | | | | | | | | | | | | | | | | | | | | rebase -i: respect core.abbrevKirill A. Shutemov2013-09-301-1/+1
* | | | | | | | | | | | | | | | | | | | | | | RelNotes/1.8.5: direct script writers to "git status --porcelain"Matthieu Moy2013-09-271-0/+3
* | | | | | | | | | | | | | | | | | | | | | | contrib: remove ciabotStefan Beller2013-09-264-553/+0
* | | | | | | | | | | | | | | | | | | | | | | Sync with Git 1.8.4.1Jonathan Nieder2013-09-262-14/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Git 1.8.4.1v1.8.4.1Jonathan Nieder2013-09-263-15/+37
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/rebase-continue-freebsd-WB' into maintJonathan Nieder2013-09-261-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/svn-1.8-serf-only' into maintJonathan Nieder2013-09-262-3/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/xread-in-full' into maintJonathan Nieder2013-09-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/send-email-ssl-die-message-fix' into maintJonathan Nieder2013-09-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/submodule-status-ignored'Jonathan Nieder2013-09-247-11/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Improve documentation concerning the status.submodulesummary settingbc/submodule-status-ignoredJens Lehmann2013-09-114-5/+24
| * | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: don't print status output with ignore=allBrian M. Carlson2013-09-043-2/+27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: fix confusing variable nameBrian M. Carlson2013-09-031-4/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/replace-with-the-same-type'Jonathan Nieder2013-09-243-9/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: 'replace' merge and non-merge commitscc/replace-with-the-same-typePhilip Oakley2013-09-091-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t6050-replace: use some long option namesChristian Couder2013-09-061-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | replace: allow long option namesChristian Couder2013-09-062-3/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/replace: add Creating Replacement Objects sectionChristian Couder2013-09-061-0/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t6050-replace: add test to clean up all the replace refsChristian Couder2013-09-061-0/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t6050-replace: test that objects are of the same typeChristian Couder2013-09-061-0/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/replace: state that objects must be of the same typeChristian Couder2013-09-061-3/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | replace: forbid replacing an object with one of a different typeChristian Couder2013-09-061-0/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kb/msvc-compile'Jonathan Nieder2013-09-247-23/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \