summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/replace-object-info'Junio C Hamano2014-01-108-26/+141
|\
| * replace info: rename 'full' to 'long' and clarify in-code symbolscc/replace-object-infoChristian 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
| * | | | | remote-hg: add tests for special filenamesFelipe Contreras2013-12-091-0/+68
| * | | | | remote-hg: fix 'shared path' pathFelipe Contreras2013-12-091-0/+3
| * | | | | remote-helpers: add extra safety checksFelipe Contreras2013-12-092-8/+20
| * | | | | remote-hg: avoid buggy strftime()jcb912013-12-091-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'js/gnome-keyring'Junio C Hamano2013-12-271-46/+39
|\ \ \ \ \
| * | | | | contrib/git-credential-gnome-keyring.c: small stylistic cleanupsjs/gnome-keyringJohn Szakmeister2013-12-161-46/+39
* | | | | | Merge branch 'jk/name-pack-after-byte-representation'Junio C Hamano2013-12-276-16/+9
|\ \ \ \ \ \
| * | | | | | pack-objects doc: treat output filename as opaquejk/name-pack-after-byte-representationJeff King2013-12-161-2/+1
| * | | | | | pack-objects: name pack files after trailer hashJeff King2013-12-053-10/+4
| * | | | | | sha1write: make buffer const-correctJeff King2013-10-242-4/+4
* | | | | | | Merge branch 'tg/diff-no-index-refactor'Junio C Hamano2013-12-275-49/+103
|\ \ \ \ \ \ \
| * | | | | | | diff: avoid some nestingtg/diff-no-index-refactorThomas Gummerer2013-12-161-18/+17
| * | | | | | | diff: add test for --no-index executed outside repoThomas Gummerer2013-12-161-0/+11
| * | | | | | | diff: don't read index when --no-index is givenThomas Gummerer2013-12-123-2/+42
| * | | | | | | diff: move no-index detection to builtin/diff.cThomas Gummerer2013-12-123-47/+51
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'zk/difftool-counts'Junio C Hamano2013-12-275-4/+43
|\ \ \ \ \ \ \
| * | | | | | | diff.c: fix some recent whitespace style violationszk/difftool-countsJeff King2013-12-161-2/+2
| * | | | | | | difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-065-4/+43
| |/ / / / / /
* | | | | | | Merge branch 'jk/cat-file-regression-fix'Junio C Hamano2013-12-272-10/+42
|\ \ \ \ \ \ \
| * | | | | | | cat-file: handle --batch format with missing type/sizejk/cat-file-regression-fixJeff King2013-12-122-1/+32
| * | | | | | | cat-file: pass expand_data to print_object_or_dieJeff King2013-12-121-10/+11
| |/ / / / / /
* | | | | | | Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano2013-12-274-11/+34
|\ \ \ \ \ \ \
| * | | | | | | rebase: use reflog to find common base with upstreamJohn Keeping2013-12-103-2/+33
| * | | | | | | pull: use merge-base --fork-point when appropriateJohn Keeping2013-12-091-9/+1