Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-svn.txt: advertise pushurl with dcommit | Sveinung Kvilhaugsvik | 2014-10-24 | 1 | -0/+4 |
* | Update draft release notes to 2.2 | Junio C Hamano | 2014-10-24 | 1 | -0/+11 |
* | Merge branch 'tb/core-filemode-doc' | Junio C Hamano | 2014-10-24 | 1 | -6/+19 |
|\ | |||||
| * | core.filemode may need manual actiontb/core-filemode-doc | Torsten Bögershausen | 2014-10-19 | 1 | -6/+19 |
* | | Merge branch 'rs/run-command-env-array' | Junio C Hamano | 2014-10-24 | 1 | -0/+5 |
|\ \ | |||||
| * | | run-command: add env_array, an optional argv_array for env | René Scharfe | 2014-10-19 | 1 | -0/+5 |
* | | | Merge branch 'po/doc-status-markup' | Junio C Hamano | 2014-10-24 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | doc: fix 'git status --help' character quotingpo/doc-status-markup | Philip Oakley | 2014-10-19 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | Update draft release notes to 2.2 | Junio C Hamano | 2014-10-21 | 1 | -4/+17 |
* | | | Merge branch 'da/mergetool-meld' | Junio C Hamano | 2014-10-21 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | mergetools/meld: make usage of `--output` configurable and more robustda/mergetool-meld | David Aguilar | 2014-10-16 | 1 | -0/+9 |
| |/ / | |||||
* | | | Merge branch 'da/mergetool-temporary-directory' | Junio C Hamano | 2014-10-21 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | mergetool: add an option for writing to a temporary directory | David Aguilar | 2014-10-16 | 1 | -0/+6 |
* | | | | Update draft release notes to 2.2 | Junio C Hamano | 2014-10-20 | 1 | -5/+17 |
* | | | | Merge branch 'cc/interpret-trailers' | Junio C Hamano | 2014-10-20 | 1 | -0/+314 |
|\ \ \ \ | |||||
| * | | | | Documentation: add documentation for 'git interpret-trailers' | Christian Couder | 2014-10-13 | 1 | -0/+314 |
* | | | | | Merge branch 'bc/asciidoc' | Junio C Hamano | 2014-10-20 | 4 | -5/+5 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Documentation: fix mismatched delimiters in git-imap-sendbc/asciidoc | brian m. carlson | 2014-10-13 | 1 | -2/+2 |
| * | | | | Documentation: adjust document title underlining | brian m. carlson | 2014-10-13 | 3 | -3/+3 |
* | | | | | Merge branch 'po/everyday-doc' | Junio C Hamano | 2014-10-16 | 10 | -130/+183 |
|\ \ \ \ \ | |||||
| * | | | | | doc: add 'everyday' to 'git help' | Philip Oakley | 2014-10-10 | 10 | -20/+30 |
| * | | | | | doc: Makefile regularise OBSOLETE_HTML list building | Philip Oakley | 2014-10-10 | 1 | -1/+2 |
| * | | | | | doc: modernise everyday.txt wording and format in man page style | Philip Oakley | 2014-10-10 | 1 | -109/+151 |
* | | | | | | Update draft release notes to 2.2 | Junio C Hamano | 2014-10-14 | 1 | -0/+21 |
* | | | | | | Merge branch 'bc/asciidoc-pretty-formats-fix' | Junio C Hamano | 2014-10-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: fix misrender of pretty-formats in Asciidoctorbc/asciidoc-pretty-formats-fix | brian m. carlson | 2014-10-08 | 1 | -1/+1 |
* | | | | | | | Merge branch 'mh/lockfile-stdio' | Junio C Hamano | 2014-10-14 | 1 | -11/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fdopen_lock_file(): access a lockfile using stdio | Michael Haggerty | 2014-10-01 | 1 | -11/+23 |
* | | | | | | | | Merge branch 'mh/lockfile' | Junio C Hamano | 2014-10-14 | 1 | -54/+188 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | get_locked_file_path(): new function | Michael Haggerty | 2014-10-01 | 1 | -0/+5 |
| * | | | | | | | lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF | Michael Haggerty | 2014-10-01 | 1 | -2/+2 |
| * | | | | | | | commit_lock_file_to(): refactor a helper out of commit_lock_file() | Michael Haggerty | 2014-10-01 | 1 | -14/+20 |
| * | | | | | | | api-lockfile: document edge cases | Michael Haggerty | 2014-10-01 | 1 | -6/+14 |
| * | | | | | | | close_lock_file(): if close fails, roll back | Michael Haggerty | 2014-10-01 | 1 | -3/+4 |
| * | | | | | | | commit_lock_file(): die() if called for unlocked lockfile object | Michael Haggerty | 2014-10-01 | 1 | -1/+2 |
| * | | | | | | | api-lockfile: revise and expand the documentation | Michael Haggerty | 2014-10-01 | 1 | -54/+167 |
* | | | | | | | | Merge branch 'so/rebase-doc-fork-point' | Junio C Hamano | 2014-10-14 | 1 | -12/+19 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Documentation/git-rebase.txt: document when --fork-point is auto-enabledso/rebase-doc-fork-point | Sergey Organov | 2014-09-29 | 1 | -12/+19 |
* | | | | | | | | Update draft release notes to 2.2 | Junio C Hamano | 2014-10-08 | 1 | -0/+13 |
* | | | | | | | | Merge branch 'jc/push-cert' | Junio C Hamano | 2014-10-08 | 5 | -7/+148 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | signed push: allow stale nonce in stateless mode | Junio C Hamano | 2014-09-17 | 2 | -0/+26 |
| * | | | | | | | | signed push: fortify against replay attacks | Junio C Hamano | 2014-09-17 | 4 | -9/+35 |
| * | | | | | | | | signed push: add "pushee" header to push certificate | Junio C Hamano | 2014-09-15 | 1 | -0/+6 |
| * | | | | | | | | signed push: remove duplicated protocol info | Junio C Hamano | 2014-09-15 | 2 | -3/+42 |
| * | | | | | | | | receive-pack: GPG-validate push certificates | Junio C Hamano | 2014-09-15 | 1 | -5/+19 |
| * | | | | | | | | push: the beginning of "git push --signed" | Junio C Hamano | 2014-09-15 | 3 | -2/+32 |
| * | | | | | | | | pack-protocol doc: typofix for PKT-LINE | Junio C Hamano | 2014-09-15 | 1 | -2/+2 |
* | | | | | | | | | Sync with maint | Junio C Hamano | 2014-10-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'maint-2.0' into maint | Junio C Hamano | 2014-10-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Merge branch 'maint-1.9' into maint-2.0 | Junio C Hamano | 2014-10-07 | 1 | -1/+1 |
| | |\ \ \ \ \ \ |