summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/sha1write-void'Junio C Hamano2014-01-104-7/+3
|\
| * do not pretend sha1write returns errorsJeff King2013-12-264-7/+3
* | Merge branch 'nd/add-empty-fix'Junio C Hamano2014-01-102-1/+20
|\ \
| * | add: don't complain when adding empty project rootNguyễn Thái Ngọc Duy2013-12-262-1/+20
* | | Merge branch 'nd/daemon-informative-errors-typofix'Junio C Hamano2014-01-101-2/+2
|\ \ \
| * | | daemon: be strict at parsing parameters --[no-]informative-errorsNguyễn Thái Ngọc Duy2013-12-201-2/+2
* | | | Merge branch 'tm/fetch-prune'Junio C Hamano2014-01-102-10/+58
|\ \ \ \
| * | | | fetch --prune: Run prune before fetchingTom Miller2014-01-032-5/+19
| * | | | fetch --prune: always print header urlTom Miller2014-01-032-5/+39
| | |_|/ | |/| |
* | | | Merge branch 'sb/diff-orderfile-config'Junio C Hamano2014-01-105-15/+125
|\ \ \ \
| * | | | diff: add diff.orderfile configuration variableSamuel Bronson2013-12-194-0/+23
| * | | | diff: let "git diff -O" read orderfile from any file and fail properlySamuel Bronson2013-12-192-15/+34
| * | | | t4056: add new tests for "git diff -O"Samuel Bronson2013-12-191-0/+68
* | | | | Merge branch 'bc/log-decoration'Junio C Hamano2014-01-102-0/+17
|\ \ \ \ \
| * | | | | log: properly handle decorations with chained tagsbrian m. carlson2013-12-202-0/+17
| | |_|/ / | |/| | |
* | | | | Merge branch 'jh/rlimit-nofile-fallback'Junio C Hamano2014-01-101-7/+30
|\ \ \ \ \
| * | | | | get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failureJunio C Hamano2013-12-181-7/+30
* | | | | | Merge branch 'rt/bfg-ad-in-filter-branch-doc'Junio C Hamano2014-01-101-1/+32
|\ \ \ \ \ \
| * | | | | | docs: add filter-branch notes on The BFGRoberto Tyley2013-12-181-1/+32
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mh/path-max'Junio C Hamano2014-01-102-31/+45
|\ \ \ \ \ \
| * | | | | | builtin/prune.c: use strbuf to avoid having to worry about PATH_MAXJeff King2013-12-191-14/+24
| * | | | | | prune-packed: use strbuf to avoid having to worry about PATH_MAXJunio C Hamano2013-12-171-17/+21
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ap/path-max'Junio C Hamano2014-01-103-36/+42
|\ \ \ \ \ \
| * | | | | | Prevent buffer overflows when path is too longAntoine Pelisse2013-12-163-36/+42
| |/ / / / /
* | | | | | Merge branch 'cc/replace-object-info'Junio C Hamano2014-01-108-26/+141
|\ \ \ \ \ \
| * | | | | | replace info: rename 'full' to 'long' and clarify in-code symbolsChristian Couder2013-12-303-14/+18
| * | | | | | Documentation/git-replace: describe --format optionChristian Couder2013-12-121-1/+18
| * | | | | | builtin/replace: unset read_replace_refsChristian Couder2013-12-122-1/+3
| * | | | | | t6050: add tests for listing with --formatChristian Couder2013-12-121-0/+37
| * | | | | | builtin/replace: teach listing using short, medium or full formatsChristian Couder2013-12-121-7/+54
| * | | | | | sha1_file: perform object replacement in sha1_object_info_extended()Christian Couder2013-12-122-7/+8
| * | | | | | t6050: show that git cat-file --batch fails with replace objectsChristian Couder2013-12-121-0/+5
| * | | | | | sha1_object_info_extended(): add an "unsigned flags" parameterChristian Couder2013-12-124-6/+6
| * | | | | | sha1_file.c: add lookup_replace_object_extended() to pass flagsChristian Couder2013-12-122-2/+7
| * | | | | | replace_object: don't check read_replace_refs twiceChristian Couder2013-12-121-3/+0
| * | | | | | rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECTChristian Couder2013-12-122-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'nd/negative-pathspec'Junio C Hamano2014-01-107-40/+354
|\ \ \ \ \ \
| * | | | | | pathspec.c: support adding prefix magic to a pathspec with mnemonic magicNguyễn Thái Ngọc Duy2013-12-061-10/+18
| * | | | | | Support pathspec magic :(exclude) and its short form :!Nguyễn Thái Ngọc Duy2013-12-067-13/+324
| * | | | | | glossary-content.txt: rephrase magic signature partNguyễn Thái Ngọc Duy2013-12-061-17/+12
* | | | | | | Merge branch 'maint'Junio C Hamano2014-01-062-8/+10
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2014-01-061-8/+8
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: de.po: fix translation of 'prefix'Ralf Thielow2014-01-031-8/+8
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Documentation/gitmodules: Only 'update' and 'url' are requiredW. Trevor King2014-01-061-0/+2
* | | | | | | | Merge branch 'maint'Junio C Hamano2013-12-301-2/+1
|\| | | | | | |
| * | | | | | | for-each-ref: remove unused variableRamkumar Ramachandra2013-12-301-2/+1
| |/ / / / / /
* | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2013-12-271-2/+8
|\ \ \ \ \ \ \
| * | | | | | | git-svn: workaround for a bug in svn serf backendRoman Kagan2013-12-271-2/+8
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fc/remote-helper-fixes'Junio C Hamano2013-12-273-9/+103
|\ \ \ \ \ \ \
| * | | | | | | remote-hg: test 'shared_path' in a moved cloneAntoine Pelisse2013-12-261-0/+11
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 13:57:47 +0100