summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...ew/empty-merge-with-dirty-indexJunio C Hamano2018-01-092-1/+51
|\
| * merge-recursive: do not look at the index during recursive mergeew/empty-merge-with-dirty-index-maintJunio C Hamano2018-01-092-1/+51
* | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano2017-12-225-42/+70
|\ \ | |/
| * merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren2017-12-222-1/+8
| * move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren2017-12-223-37/+42
| * t6044: recursive can silently incorporate dirty changes in a mergeElijah Newren2017-12-221-5/+21
* | RelNotes: the tenth batchJunio C Hamano2017-12-191-0/+46
* | Merge branch 'ls/editor-waiting-message'Junio C Hamano2017-12-197-7/+41
|\ \
| * | launch_editor(): indicate that Git waits for user inputls/editor-waiting-messageLars Schneider2017-12-074-0/+30
| * | refactor "dumb" terminal determinationLars Schneider2017-12-044-7/+11
* | | Merge branch 'sg/setup-doc-update'Junio C Hamano2017-12-191-1/+1
|\ \ \
| * | | setup.c: fix comment about order of .git directory discoverysg/setup-doc-updateSZEDER Gábor2017-12-071-1/+1
* | | | Merge branch 'ar/unconfuse-three-dots'Junio C Hamano2017-12-1925-24/+458
|\ \ \ \
| * | | | t2020: test variations that matterar/unconfuse-three-dotsJunio C Hamano2017-12-061-3/+3
| * | | | t4013: test new output from diff --abbrev --rawAnn T Ropea2017-12-0615-1/+253
| * | | | diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 valueAnn T Ropea2017-12-061-1/+7
| * | | | t4013: prepare for upcoming "diff --raw --abbrev" output format changeAnn T Ropea2017-12-061-6/+23
| * | | | checkout: describe_detached_head: remove ellipsis after committishAnn T Ropea2017-12-063-3/+132
| * | | | print_sha1_ellipsis: introduce helperAnn T Ropea2017-12-046-3/+33
| * | | | Documentation: user-manual: limit usage of ellipsisAnn T Ropea2017-12-041-10/+10
| * | | | Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line wit...Ann T Ropea2017-12-041-1/+1
* | | | | Merge branch 'tg/worktree-create-tracking'Junio C Hamano2017-12-198-51/+277
|\ \ \ \ \
| * | | | | add worktree.guessRemote config optionThomas Gummerer2017-12-064-2/+56
| * | | | | worktree: add --guess-remote flag to add subcommandThomas Gummerer2017-12-063-0/+46
| * | | | | worktree: make add <path> <branch> dwimThomas Gummerer2017-11-273-0/+43
| * | | | | worktree: add --[no-]track option to the add subcommandThomas Gummerer2017-11-273-0/+65
| * | | | | worktree: add can be created from any commit-ishThomas Gummerer2017-11-271-10/+10
| * | | | | checkout: factor out functions to new lib fileThomas Gummerer2017-11-274-40/+58
* | | | | | Merge branch 'gk/tracing-optimization'Junio C Hamano2017-12-192-40/+48
|\ \ \ \ \ \
| * | | | | | trace: improve performance while category is disabledgk/tracing-optimizationGennady Kupava2017-12-062-20/+42
| * | | | | | trace: remove trace key normalizationGennady Kupava2017-11-272-21/+7
| |/ / / / /
* | | | | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-12-192-0/+19
|\ \ \ \ \ \
| * | | | | | diff-tree: read the index so attribute checks work in bare repositoriesbw/submodule-config-cleanupBrandon Williams2017-12-062-0/+19
* | | | | | | Merge branch 'sb/clone-recursive-submodule-doc'Junio C Hamano2017-12-191-8/+11
|\ \ \ \ \ \ \
| * | | | | | | Documentation/git-clone: improve description for submodule recursingsb/clone-recursive-submodule-docStefan Beller2017-12-051-8/+11
* | | | | | | | Merge branch 'ls/git-gui-no-double-utf8-author-name'Junio C Hamano2017-12-191-3/+9
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no...ls/git-gui-no-double-utf8-author-nameJunio C Hamano2017-12-051-3/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | git-gui: prevent double UTF-8 conversionŁukasz Stelmach2017-12-051-3/+9
* | | | | | | | | Merge branch 'bw/pathspec-match-submodule-boundary'Junio C Hamano2017-12-194-2/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pathspec: only match across submodule boundaries when requestedbw/pathspec-match-submodule-boundaryBrandon Williams2017-12-054-2/+24
* | | | | | | | | | Merge branch 'jt/diff-anchored-patience'Junio C Hamano2017-12-196-7/+169
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: support anchoring line(s)jt/diff-anchored-patienceJonathan Tan2017-11-286-7/+169
* | | | | | | | | | | Merge branch 'en/merge-recursive-icase-removal'Junio C Hamano2017-12-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-recursive: ignore_case shouldn't reject intentional removalsen/merge-recursive-icase-removalElijah Newren2017-11-271-1/+1
* | | | | | | | | | | | Merge branch 'en/rename-progress'Junio C Hamano2017-12-196-27/+44
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diffcore-rename: make diff-tree -l0 mean -l<large>en/rename-progressJonathan Tan2017-12-022-0/+17
| * | | | | | | | | | | | sequencer: show rename progress during cherry picksElijah Newren2017-11-151-0/+1
| * | | | | | | | | | | | diff: remove silent clamp of renameLimitElijah Newren2017-11-152-8/+5
| * | | | | | | | | | | | progress: fix progress meters when dealing with lots of workElijah Newren2017-11-153-20/+21
| * | | | | | | | | | | | sequencer: warn when internal merge may be suboptimal due to renameLimitElijah Newren2017-11-141-0/+1
View Lorry Controller Status