summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'jh/empty-notes'Junio C Hamano2014-12-054-825/+789
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t3301: modernize styleJohan Herland2014-11-141-699/+601
| * | | | | | | | | | | notes: empty notes should be shown by 'git log'Johan Herland2014-11-122-2/+13
| * | | | | | | | | | | builtin/notes: add --allow-empty, to allow storing empty notesJohan Herland2014-11-123-11/+28
| * | | | | | | | | | | builtin/notes: split create_note() to clarify add vs. remove logicJohan Herland2014-11-121-49/+54
| * | | | | | | | | | | builtin/notes: simplify early exit code in add()Johan Herland2014-11-121-18/+17
| * | | | | | | | | | | builtin/notes: refactor note file path into struct note_dataJohan Herland2014-11-101-17/+21
| * | | | | | | | | | | builtin/notes: improve namingJohan Herland2014-11-101-55/+54
| * | | | | | | | | | | t3301: verify that 'git notes' removes empty notes by defaultJohan Herland2014-11-101-0/+27
| * | | | | | | | | | | builtin/notes: fix premature failure when trying to add the empty blobJohan Herland2014-11-101-1/+1
* | | | | | | | | | | | Merge branch 'sv/get-builtin'Junio C Hamano2014-12-051-12/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | builtin: move builtin retrieval to get_builtin()sv/get-builtinSlavomir Vlcek2014-11-131-12/+15
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/checkout-from-tree'Junio C Hamano2014-12-052-0/+35
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | checkout $tree: do not throw away unchanged index entriesjk/checkout-from-treeJeff King2014-11-132-0/+35
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tq/git-ssh-command'Junio C Hamano2014-12-052-15/+26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git_connect: set ssh shell command in GIT_SSH_COMMANDtq/git-ssh-commandThomas Quinot2014-11-102-15/+26
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/env-array-in-child-process'Junio C Hamano2014-12-052-35/+29
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | use args member of struct child_processrs/env-array-in-child-processRené Scharfe2014-11-102-35/+29
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2014-12-051-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin2014-11-291-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | l10n: de.po: fix typosHartmut Henkel2014-11-281-9/+9
* | | | | | | | | | | | | | Start post 2.2 cycleJunio C Hamano2014-12-051-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Git 2.2v2.2.0Junio C Hamano2014-11-262-1/+6
* | | | | | | | | | | | | RelNotes: spelling & grammar tweaksMarc Branchaud2014-11-261-51/+52
|/ / / / / / / / / / / /
* | | | | | | | | | | | Git 2.2.0-rc3v2.2.0-rc3Junio C Hamano2014-11-212-14/+15
* | | | | | | | | | | | l10n: remove a superfluous translation for push.cJiang Xin2014-11-206-30/+6
* | | | | | | | | | | | l10n: de.po: translate 2 messagesRalf Thielow2014-11-201-3/+1
* | | | | | | | | | | | l10n: de.po: translate 2 new messagesRalf Thielow2014-11-201-2/+2
* | | | | | | | | | | | l10n: batch updates for one trivial changeJiang Xin2014-11-207-519/+554
* | | | | | | | | | | | l10n: git.pot: v2.2.0 round 2 (1 updated)Jiang Xin2014-11-201-24/+24
* | | | | | | | | | | | Merge branch 'sv/submitting-final-patch'Junio C Hamano2014-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | SubmittingPatches: final submission is To: maintainer and CC: listsv/submitting-final-patchSlavomir Vlcek2014-11-131-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sn/tutorial-status-output-example'Junio C Hamano2014-11-192-19/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gittutorial: fix output of 'git status'sn/tutorial-status-output-exampleStefan Naewe2014-11-132-19/+21
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mh/doc-remote-helper-xref'Junio C Hamano2014-11-195-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc: add some crossrefs between manual pagesmh/doc-remote-helper-xrefMax Horn2014-11-115-0/+22
* | | | | | | | | | | | | Merge branch 'tb/no-relative-file-url'Junio C Hamano2014-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t5705: the file:// URL should be absolutetb/no-relative-file-urlTorsten Bögershausen2014-11-131-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'cc/interpret-trailers'Junio C Hamano2014-11-191-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | trailer: display a trailer without its trailing newlinecc/interpret-trailersChristian Couder2014-11-101-2/+6
| * | | | | | | | | | | | | trailer: ignore comment lines inside the trailersChristian Couder2014-11-101-2/+4
* | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2014-11-181-2165/+2392
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | l10n: Update Catalan translationAlex Henrie2014-11-171-2165/+2392
* | | | | | | | | | | | | | | Merge branch 'jc/doc-commit-only'Junio C Hamano2014-11-181-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation/git-commit: clarify that --only/--include records the working t...jc/doc-commit-onlyJunio C Hamano2014-11-071-2/+3
* | | | | | | | | | | | | | | | Merge branch 'ta/tutorial-modernize'Junio C Hamano2014-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | gittutorial.txt: remove reference to ancient Git versionta/tutorial-modernizeThomas Ackermann2014-11-111-1/+1
* | | | | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2014-11-182-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | difftool: honor --trust-exit-code for builtin toolsDavid Aguilar2014-11-142-0/+6
* | | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano2014-11-171-1990/+2239
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | / / / / | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |