summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Prevent space after directories in tcsh completionMarc Khouzam2013-01-071-12/+21
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ap/status-ignored-in-ignored-directory' into maintJunio C Hamano2013-01-283-22/+225
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | status: always report ignored tracked directoriesAntoine Pelisse2013-01-071-6/+3
| * | | | | | | | | | | | git-status: Test --ignored behaviorAntoine Pelisse2013-01-011-0/+146
| * | | | | | | | | | | | dir.c: Make git-status --ignored more consistentAntoine Pelisse2013-01-012-21/+81
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'er/stop-recommending-parsecvs' into maintJunio C Hamano2013-01-281-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove the suggestion to use parsecvs, which is currently broken.Eric S. Raymond2012-12-281-4/+2
* | | | | | | | | | | | | Merge branch 'mh/ceiling' into maintJunio C Hamano2013-01-2811-165/+202
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | string_list_longest_prefix(): remove functionMichael Haggerty2012-10-295-86/+0
| * | | | | | | | | | | | setup_git_directory_gently_1(): resolve symlinks in ceiling pathsMichael Haggerty2012-10-291-13/+13
| * | | | | | | | | | | | longest_ancestor_length(): require prefix list entries to be normalizedMichael Haggerty2012-10-294-44/+91
| * | | | | | | | | | | | longest_ancestor_length(): take a string_list argument for prefixesMichael Haggerty2012-10-294-17/+26
| * | | | | | | | | | | | longest_ancestor_length(): use string_list_split()Michael Haggerty2012-10-291-7/+11
| * | | | | | | | | | | | Introduce new function real_path_if_valid()Michael Haggerty2012-10-292-0/+6
| * | | | | | | | | | | | real_path_internal(): add comment explaining use of cwdMichael Haggerty2012-10-291-0/+7
| * | | | | | | | | | | | Introduce new static function real_path_internal()Michael Haggerty2012-10-291-21/+72
* | | | | | | | | | | | | git-for-each-ref.txt: 'raw' is a supported date formatJohn Keeping2013-01-211-1/+1
* | | | | | | | | | | | | Start preparing for 1.8.1.2Junio C Hamano2013-01-202-1/+14
* | | | | | | | | | | | | Merge branch 'nz/send-email-headers-are-case-insensitive' into maintJunio C Hamano2013-01-201-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-send-email: treat field names as case-insensitivelyNickolai Zeldovich2013-01-061-5/+5
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rs/zip-with-uncompressed-size-in-the-header' into maintJunio C Hamano2013-01-201-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | archive-zip: write uncompressed size into header even with streamingRené Scharfe2013-01-061-5/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/zip-tests' into maintJunio C Hamano2013-01-205-80/+140
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | t5003: check if unzip supports symlinksRené Scharfe2013-01-072-7/+19
| * | | | | | | | | | | | t5000, t5003: move ZIP tests into their own scriptRené Scharfe2013-01-072-69/+119
| * | | | | | | | | | | | t0024, t5000: use test_lazy_prereq for UNZIPRené Scharfe2013-01-072-14/+10
| * | | | | | | | | | | | t0024, t5000: clear variable UNZIP, use GIT_UNZIP insteadRené Scharfe2013-01-063-8/+10
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Git 1.8.1.1v1.8.1.1Junio C Hamano2013-01-143-2/+54
* | | | | | | | | | | | Merge branch 'jk/complete-commit-c' into maintJunio C Hamano2013-01-141-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | completion: complete refs for "git commit -c"Jeff King2012-12-151-0/+7
* | | | | | | | | | | | | Merge branch 'jk/unify-exit-code-by-receiving-signal' into maintJunio C Hamano2013-01-144-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | run-command: encode signal death as a positive integerJeff King2013-01-064-7/+5
* | | | | | | | | | | | | | Merge branch 'jn/xml-depends-on-asciidoc-conf' into maintJunio C Hamano2013-01-141-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | docs: manpage XML depends on asciidoc.confJonathan Nieder2013-01-061-5/+3
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/maint-fast-import-doc-reorder' into maintJunio C Hamano2013-01-141-46/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-fast-import(1): reorganise optionsJohn Keeping2013-01-091-39/+47
| * | | | | | | | | | | | | | git-fast-import(1): combine documentation of --[no-]relative-marksJohn Keeping2013-01-091-6/+4
* | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \