summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'jk/shortlog-no-wrap-doc' into maintJunio C Hamano2013-01-141-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-shortlog(1): document behaviour of zero-width wrapJohn Keeping2013-01-091-0/+3
* | | | | | | | | | | Merge branch 'jk/maint-fast-import-doc-dedup-done' into maintJunio C Hamano2013-01-141-5/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | git-fast-import(1): remove duplicate '--done' optionJohn Keeping2013-01-081-5/+2
* | | | | | | | | | | Merge branch 'jc/comment-cygwin-win32api-in-makefile' into maintJunio C Hamano2013-01-141-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Makefile: add comment on CYGWIN_V15_WIN32APIMark Levedahl2013-01-061-0/+4
* | | | | | | | | | | | Merge branch 'rs/leave-base-name-in-name-field-of-tar' into maintJunio C Hamano2013-01-141-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | archive-tar: split long paths more carefullyRené Scharfe2013-01-051-0/+2
* | | | | | | | | | | | | Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maintJunio C Hamano2013-01-142-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clone: support atomic operation with --separate-git-dirJens Lehmann2013-01-052-2/+14
* | | | | | | | | | | | | | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintJunio C Hamano2013-01-143-8/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | merge --no-edit: do not credit people involved in the side branchJunio C Hamano2012-12-283-8/+17
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/apply-trailing-blank-removal' into maintJunio C Hamano2013-01-141-6/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | apply.c:update_pre_post_images(): the preimage can be truncatedJunio C Hamano2012-10-121-6/+17
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'pf/editor-ignore-sigint' into maintJunio C Hamano2013-01-142-7/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | fix compilation with NO_PTHREADSJeff King2013-01-051-1/+1
| * | | | | | | | | | | | | launch_editor: propagate signals from editor to gitJeff King2012-12-021-1/+4
| * | | | | | | | | | | | | run-command: do not warn about child death from terminalJeff King2012-12-021-1/+2
| * | | | | | | | | | | | | launch_editor: ignore terminal signals while editor has controlPaul Fox2012-12-021-1/+8
| * | | | | | | | | | | | | launch_editor: refactor to use start/finish_commandJeff King2012-12-021-1/+9
| * | | | | | | | | | | | | run-command: drop silent_exec_failure arg from wait_or_whineJeff King2012-12-021-4/+3
* | | | | | | | | | | | | | Merge branch 'mk/maint-graph-infinity-loop' into maintJunio C Hamano2013-01-143-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | graph.c: infinite loop in git whatchanged --graph -mMichał Kiedrowicz2012-09-253-6/+16
* | | | | | | | | | | | | | | Merge branch 'as/api-allocation-doc' into maintJunio C Hamano2013-01-111-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | api-allocation-growing.txt: encourage better variable namingAdam Spiers2013-01-061-6/+8
* | | | | | | | | | | | | | | | Merge branch 'jk/enable-test-lint-by-default' into maintJunio C Hamano2013-01-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | tests: turn on test-lint by defaultJeff King2013-01-031-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maintJunio C Hamano2013-01-112-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | merge: Honor prepare-commit-msg return codeAntoine Pelisse2013-01-032-2/+17
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jc/submittingpatches' into maintJunio C Hamano2013-01-111-84/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | SubmittingPatches: give list and maintainer addressesJunio C Hamano2013-01-021-2/+6
| * | | | | | | | | | | | | | | | SubmittingPatches: remove overlong checklistJunio C Hamano2013-01-021-76/+61
| * | | | | | | | | | | | | | | | SubmittingPatches: mention subsystems with dedicated repositoriesJunio C Hamano2013-01-011-0/+24
| * | | | | | | | | | | | | | | | SubmittingPatches: who am I and who cares?Junio C Hamano2013-01-011-8/+2
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'os/gitweb-highlight-uncaptured' into maintJunio C Hamano2013-01-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | gitweb: fix error in sanitize when highlight is enabledOrgad Shaneh2013-01-011-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'jn/less-reconfigure' into maintJunio C Hamano2013-01-111-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | build: do not automatically reconfigure unless configure.ac changedJonathan Nieder2013-01-021-2/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'kb/maint-bundle-doc' into maintJunio C Hamano2013-01-111-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Documentation: full-ness of a bundle is significant for cloningJunio C Hamano2013-01-011-4/+3
| * | | | | | | | | | | | | | | | | Documentation: correct example restore from bundleKirill Brilliantov2013-01-011-1/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'as/test-name-alias-uniquely' into maintJunio C Hamano2013-01-111-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Use longer alias names in subdirectory testsAaron Schrab2012-12-281-6/+6
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jn/warn-on-inaccessible-loosen' into maintJunio C Hamano2013-01-115-7/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | config: exit on error accessing any config fileJonathan Nieder2012-10-141-3/+3
| * | | | | | | | | | | | | | | | | doc: advertise GIT_CONFIG_NOSYSTEMJonathan Nieder2012-10-142-0/+12
| * | | | | | | | | | | | | | | | | config: treat user and xdg config permission problems as errorsJonathan Nieder2012-10-133-2/+11
| * | | | | | | | | | | | | | | | | config, gitignore: failure to access with ENOTDIR is okJonathan Nieder2012-10-132-2/+5
* | | | | | | | | | | | | | | | | | Merge branch 'ja/directory-attrs' into maintJunio C Hamano2013-01-113-9/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add directory pattern matching to attributesJean-Noël AVILA2012-12-173-9/+76