summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | tests: use "env" to run commands with temporary env-var settingsdt/tests-with-env-not-subshellDavid Tran2014-03-1912-152/+42
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Update draft release notes to 2.0Junio C Hamano2014-03-281-0/+27
* | | | | | | | | Merge branch 'ys/fsck-commit-parsing'Junio C Hamano2014-03-281-12/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fsck.c:fsck_commit(): use skip_prefix() to verify and skip constantys/fsck-commit-parsingYuxuan Shui2014-03-191-11/+13
| * | | | | | | | | fsck.c:fsck_ident(): ident points at a const stringYuxuan Shui2014-03-131-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bg/rebase-off-of-previous-branch'Junio C Hamano2014-03-282-0/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase: allow "-" short-hand for the previous branchBrian Gesiak2014-03-192-0/+21
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bp/commit-p-editor'Junio C Hamano2014-03-2810-39/+137
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | run-command: mark run_hook_with_custom_index as deprecatedbp/commit-p-editorBenoit Pierre2014-03-181-0/+1
| * | | | | | | | | merge hook tests: fix and update testsBenoit Pierre2014-03-181-6/+21
| * | | | | | | | | merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-181-1/+1
| * | | | | | | | | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-189-32/+80
| * | | | | | | | | test patch hunk editing with "commit -p -m"Benoit Pierre2014-03-181-0/+34
| * | | | | | | | | merge hook tests: use 'test_must_fail' instead of '!'Benoit Pierre2014-03-111-2/+2
| * | | | | | | | | merge hook tests: fix missing '&&' in testBenoit Pierre2014-03-111-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ah/doc-gitk-config'Junio C Hamano2014-03-281-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/gitk: document the location of the configulation fileah/doc-gitk-configAstril Hayato2014-03-201-2/+8
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fr/add-interactive-argv-array'Junio C Hamano2014-03-281-11/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: use struct argv_array in run_add_interactive()fr/add-interactive-argv-arrayFabian Ruch2014-03-181-11/+10
* | | | | | | | | | Merge branch 'jk/subtree-prefix'Junio C Hamano2014-03-281-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | subtree: initialize "prefix" variablejk/subtree-prefixJeff King2014-03-171-0/+1
* | | | | | | | | | | Merge branch 'jk/pack-bitmap-progress'Junio C Hamano2014-03-281-11/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pack-objects: show reused packfile objects in "Counting objects"jk/pack-bitmap-progressJeff King2014-03-171-8/+3
| * | | | | | | | | | | pack-objects: show progress for reused packfilesJeff King2014-03-171-3/+16
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-03-282-2/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pack-objects: turn off bitmaps when skipping objectsJeff King2014-03-172-2/+15
* | | | | | | | | | | | Update draft release notes to 2.0Junio C Hamano2014-03-251-0/+29
* | | | | | | | | | | | Merge branch 'ss/test-on-mingw-rsync-path-no-absolute'Junio C Hamano2014-03-251-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t5510: Do not use $(pwd) when fetching / pushing / pulling via rsyncss/test-on-mingw-rsync-path-no-absoluteSebastian Schuberth2014-03-191-3/+3
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bb/diff-no-index-dotdot'Junio C Hamano2014-03-251-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()bb/diff-no-index-dotdotBrian Bourn2014-03-191-1/+2
| * | | | | | | | | | | | diff-no-index: rename read_directory()Brian Bourn2014-03-191-3/+3
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'us/printf-not-echo'Junio C Hamano2014-03-252-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | test-lib.sh: do not "echo" caller-supplied stringsus/printf-not-echoUwe Storbeck2014-03-181-2/+2
| * | | | | | | | | | | | rebase -i: do not "echo" random user-supplied stringsUwe Storbeck2014-03-171-1/+1
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rr/doc-merge-strategies'Junio C Hamano2014-03-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/merge-strategies: avoid hyphenated commandsrr/doc-merge-strategiesRamkumar Ramachandra2014-03-171-2/+2
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/index-pack-error-message'Junio C Hamano2014-03-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | index-pack: report error using the correct variablend/index-pack-error-messageJunio C Hamano2014-03-171-2/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/lib-terminal-lazy'Junio C Hamano2014-03-251-18/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t/lib-terminal: make TTY a lazy prerequisitejk/lib-terminal-lazyJeff King2014-03-141-18/+19
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'dm/configure-iconv-locale-charset'Junio C Hamano2014-03-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | configure.ac: link with -liconv for locale_charset()dm/configure-iconv-locale-charsetDmitry Marakasov2014-03-111-1/+1
* | | | | | | | | | | | | Merge branch 'nd/commit-editor-cleanup'Junio C Hamano2014-03-255-12/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | commit: add --cleanup=scissorsnd/commit-editor-cleanupNguyễn Thái Ngọc Duy2014-02-253-4/+34
| * | | | | | | | | | | | | wt-status.c: move cut-line print code out to wt_status_add_cut_lineNguyễn Thái Ngọc Duy2014-02-182-7/+13
| * | | | | | | | | | | | | wt-status.c: make cut_line[] const to shrink .data section a bitNguyễn Thái Ngọc Duy2014-02-181-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/warn-on-object-refname-ambiguity'Junio C Hamano2014-03-252-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rev-list: disable object/refname ambiguity check with --stdinjk/warn-on-object-refname-ambiguityJeff King2014-03-131-0/+6
| * | | | | | | | | | | | | cat-file: restore warn_on_object_refname_ambiguity flagJeff King2014-03-131-0/+3