aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'bp/commit-p-editor'Junio C Hamano2014-03-28
|\
| * run-command: mark run_hook_with_custom_index as deprecatedBenoit Pierre2014-03-18
| * merge hook tests: fix and update testsBenoit Pierre2014-03-18
| * merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-18
| * commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-18
| * test patch hunk editing with "commit -p -m"Benoit Pierre2014-03-18
| * merge hook tests: use 'test_must_fail' instead of '!'Benoit Pierre2014-03-11
| * merge hook tests: fix missing '&&' in testBenoit Pierre2014-03-11
* | Merge branch 'ah/doc-gitk-config'Junio C Hamano2014-03-28
|\ \
| * | Documentation/gitk: document the location of the configulation fileAstril Hayato2014-03-20
| |/
* | Merge branch 'fr/add-interactive-argv-array'Junio C Hamano2014-03-28
|\ \
| * | add: use struct argv_array in run_add_interactive()Fabian Ruch2014-03-18
* | | Merge branch 'jk/subtree-prefix'Junio C Hamano2014-03-28
|\ \ \
| * | | subtree: initialize "prefix" variableJeff King2014-03-17
* | | | Merge branch 'jk/pack-bitmap-progress'Junio C Hamano2014-03-28
|\ \ \ \
| * | | | pack-objects: show reused packfile objects in "Counting objects"Jeff King2014-03-17
| * | | | pack-objects: show progress for reused packfilesJeff King2014-03-17
| |/ / /
* | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-03-28
|\ \ \ \
| * | | | pack-objects: turn off bitmaps when skipping objectsJeff King2014-03-17
* | | | | Update draft release notes to 2.0Junio C Hamano2014-03-25
* | | | | Merge branch 'ss/test-on-mingw-rsync-path-no-absolute'Junio C Hamano2014-03-25
|\ \ \ \ \
| * | | | | t5510: Do not use $(pwd) when fetching / pushing / pulling via rsyncSebastian Schuberth2014-03-19
| | |_|_|/ | |/| | |
* | | | | Merge branch 'bb/diff-no-index-dotdot'Junio C Hamano2014-03-25
|\ \ \ \ \
| * | | | | diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()Brian Bourn2014-03-19
| * | | | | diff-no-index: rename read_directory()Brian Bourn2014-03-19
| |/ / / /
* | | | | Merge branch 'us/printf-not-echo'Junio C Hamano2014-03-25
|\ \ \ \ \
| * | | | | test-lib.sh: do not "echo" caller-supplied stringsUwe Storbeck2014-03-18
| * | | | | rebase -i: do not "echo" random user-supplied stringsUwe Storbeck2014-03-17
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rr/doc-merge-strategies'Junio C Hamano2014-03-25
|\ \ \ \ \
| * | | | | Documentation/merge-strategies: avoid hyphenated commandsRamkumar Ramachandra2014-03-17
* | | | | | Merge branch 'nd/index-pack-error-message'Junio C Hamano2014-03-25
|\ \ \ \ \ \
| * | | | | | index-pack: report error using the correct variableJunio C Hamano2014-03-17
| |/ / / / /
* | | | | | Merge branch 'jk/lib-terminal-lazy'Junio C Hamano2014-03-25
|\ \ \ \ \ \
| * | | | | | t/lib-terminal: make TTY a lazy prerequisiteJeff King2014-03-14
| |/ / / / /
* | | | | | Merge branch 'dm/configure-iconv-locale-charset'Junio C Hamano2014-03-25
|\ \ \ \ \ \
| * | | | | | configure.ac: link with -liconv for locale_charset()Dmitry Marakasov2014-03-11
* | | | | | | Merge branch 'nd/commit-editor-cleanup'Junio C Hamano2014-03-25
|\ \ \ \ \ \ \
| * | | | | | | commit: add --cleanup=scissorsNguyễn Thái Ngọc Duy2014-02-25
| * | | | | | | wt-status.c: move cut-line print code out to wt_status_add_cut_lineNguyễn Thái Ngọc Duy2014-02-18
| * | | | | | | wt-status.c: make cut_line[] const to shrink .data section a bitNguyễn Thái Ngọc Duy2014-02-18
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/warn-on-object-refname-ambiguity'Junio C Hamano2014-03-25
|\ \ \ \ \ \ \
| * | | | | | | rev-list: disable object/refname ambiguity check with --stdinJeff King2014-03-13
| * | | | | | | cat-file: restore warn_on_object_refname_ambiguity flagJeff King2014-03-13
| * | | | | | | cat-file: fix a minor memory leak in batch_objectsJeff King2014-01-07
| * | | | | | | cat-file: refactor error handling of batch_objectsJeff King2014-01-07
* | | | | | | | Merge branch 'mh/remove-subtree-long-pathname-fix'Junio C Hamano2014-03-25
|\ \ \ \ \ \ \ \
| * | | | | | | | entry.c: fix possible buffer overflow in remove_subtree()Michael Haggerty2014-03-13
| * | | | | | | | checkout_entry(): use the strbuf throughout the functionMichael Haggerty2014-03-13
* | | | | | | | | Merge branch 'nd/indent-fix-connect-c'Junio C Hamano2014-03-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | connect.c: SP after "}", not TABNguyễn Thái Ngọc Duy2014-03-13