Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | C: have space around && and || operators | Junio C Hamano | 2013-10-16 | 5 | -5/+5 |
* | mergetool--lib: Fix typo in the merge/difftool help | Stefan Saasen | 2013-10-14 | 1 | -1/+1 |
* | sparse: suppress some "using sizeof on a function" warnings | Ramsay Jones | 2013-10-14 | 1 | -0/+3 |
* | format-patch doc: Thunderbird wraps lines unless mailnews.wraplength=0 | Ramsay Jones | 2013-10-14 | 1 | -1/+2 |
* | Merge branch 'rj/highlight-test-hang' | Jonathan Nieder | 2013-10-14 | 1 | -2/+4 |
|\ | |||||
| * | gitweb test: fix highlight test hang on Linux Mintrj/highlight-test-hang | Ramsay Jones | 2013-10-14 | 1 | -2/+4 |
* | | wrapper.c: only define gitmkstemps if needed | Ramsay Jones | 2013-10-14 | 1 | -0/+2 |
* | | refs.c: spell NULL pointer as NULL | Ramsay Jones | 2013-10-14 | 1 | -1/+1 |
* | | config.c: mark file-local function static | Ramsay Jones | 2013-10-14 | 1 | -1/+1 |
* | | CodingGuidelines: style for multi-line comments | brian m. carlson | 2013-10-14 | 1 | -0/+8 |
* | | Merge branch 'nv/doc-config-signingkey' | Jonathan Nieder | 2013-10-14 | 1 | -5/+5 |
|\ \ | |||||
| * | | config doc: user.signingkey is also used for signed commitsnv/doc-config-signingkey | Nicolas Vigier | 2013-10-14 | 1 | -5/+5 |
* | | | Merge branch 'sb/checkout-test-complex-path' | Jonathan Nieder | 2013-10-14 | 1 | -7/+7 |
|\ \ \ | |||||
| * | | | checkout test: enable test with complex relative pathsb/checkout-test-complex-path | Stefan Beller | 2013-10-09 | 1 | -7/+7 |
* | | | | Merge branch 'rt/cherry-pick-status' | Jonathan Nieder | 2013-10-14 | 3 | -11/+17 |
|\ \ \ \ | |||||
| * | | | | status: show commit sha1 in "You are currently cherry-picking" messagert/cherry-pick-status | Ralf Thielow | 2013-10-11 | 3 | -6/+12 |
| * | | | | status test: add missing && to <<EOF blocks | Jonathan Nieder | 2013-10-11 | 1 | -5/+5 |
| |/ / / | |||||
* | | | | Merge branch 'rj/doc-formatting-fix' | Jonathan Nieder | 2013-10-14 | 2 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | howto/revert-a-faulty-merge: fix unescaped '^'srj/doc-formatting-fix | Ramsay Jones | 2013-10-14 | 1 | -4/+4 |
| * | | | | howto/setup-git-server-over-http: fix unescaped '^'s | Ramsay Jones | 2013-10-14 | 1 | -2/+2 |
* | | | | | Merge branch 'po/remote-set-head-usage' | Jonathan Nieder | 2013-10-14 | 2 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | remote set-head -h: add long options to synopsispo/remote-set-head-usage | Philip Oakley | 2013-09-27 | 1 | -2/+2 |
| * | | | | | remote doc: document long forms of set-head options | Philip Oakley | 2013-09-27 | 1 | -3/+3 |
| |/ / / / | |||||
* | | | | | Merge branch 'nd/clone-local-with-colon' | Jonathan Nieder | 2013-10-14 | 2 | -2/+46 |
|\ \ \ \ \ | |||||
| * | | | | | clone: tighten "local paths with colons" check a bitnd/clone-local-with-colon | Nguyễn Thái Ngọc Duy | 2013-09-27 | 2 | -2/+46 |
* | | | | | | Merge branch 'jx/clean-interactive' | Jonathan Nieder | 2013-10-14 | 2 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | path-utils test: rename mingw_path function to print_pathjx/clean-interactive | Sebastian Schuberth | 2013-10-14 | 2 | -3/+3 |
* | | | | | | | Merge branch 'jk/diff-algo' | Jonathan Nieder | 2013-10-14 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | merge-recursive: fix parsing of "diff-algorithm" optionjk/diff-algo | John Keeping | 2013-09-26 | 1 | -2/+2 |
* | | | | | | | | mergetools/diffmerge: support DiffMerge as a git mergetool | Stefan Saasen | 2013-10-13 | 3 | -2/+18 |
* | | | | | | | | .mailmap: switch to Thomas Rast's personal address | Thomas Rast | 2013-10-13 | 1 | -1/+3 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'tz/credential-netrc' | Jonathan Nieder | 2013-10-08 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-credential-netrc: fix uninitialized warningtz/credential-netrc | Ted Zlatanov | 2013-10-08 | 1 | -1/+3 |
* | | | | | | | | Documentation/Makefile: make AsciiDoc dblatex dir configurable | John Keeping | 2013-10-03 | 1 | -1/+2 |
* | | | | | | | | rebase -i: respect core.abbrev | Kirill A. Shutemov | 2013-09-30 | 1 | -1/+1 |
* | | | | | | | | RelNotes/1.8.5: direct script writers to "git status --porcelain" | Matthieu Moy | 2013-09-27 | 1 | -0/+3 |
* | | | | | | | | contrib: remove ciabot | Stefan Beller | 2013-09-26 | 4 | -553/+0 |
* | | | | | | | | Sync with Git 1.8.4.1 | Jonathan Nieder | 2013-09-26 | 2 | -14/+36 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Git 1.8.4.1v1.8.4.1 | Jonathan Nieder | 2013-09-26 | 3 | -15/+37 |
| * | | | | | | | Merge branch 'mm/rebase-continue-freebsd-WB' into maint | Jonathan Nieder | 2013-09-26 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'km/svn-1.8-serf-only' into maint | Jonathan Nieder | 2013-09-26 | 2 | -3/+34 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'js/xread-in-full' into maint | Jonathan Nieder | 2013-09-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'bc/send-email-ssl-die-message-fix' into maint | Jonathan Nieder | 2013-09-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/submodule-status-ignored' | Jonathan Nieder | 2013-09-24 | 7 | -11/+55 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Improve documentation concerning the status.submodulesummary settingbc/submodule-status-ignored | Jens Lehmann | 2013-09-11 | 4 | -5/+24 |
| * | | | | | | | | | | | | submodule: don't print status output with ignore=all | Brian M. Carlson | 2013-09-04 | 3 | -2/+27 |
| * | | | | | | | | | | | | submodule: fix confusing variable name | Brian M. Carlson | 2013-09-03 | 1 | -4/+4 |
* | | | | | | | | | | | | | Merge branch 'cc/replace-with-the-same-type' | Jonathan Nieder | 2013-09-24 | 3 | -9/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Doc: 'replace' merge and non-merge commitscc/replace-with-the-same-type | Philip Oakley | 2013-09-09 | 1 | -0/+1 |
| * | | | | | | | | | | | | | t6050-replace: use some long option names | Christian Couder | 2013-09-06 | 1 | -4/+4 |