Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | Merge branch 'sb/sequencer-abort-safety' | Junio C Hamano | 2016-12-21 | |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | Revert "sequencer: remove useless get_dir() function" | Junio C Hamano | 2016-12-14 | |
| * | | | | | | | sequencer: remove useless get_dir() function | Stephan Beyer | 2016-12-09 | |
| * | | | | | | | sequencer: make sequencer abort safer | Stephan Beyer | 2016-12-09 | |
| * | | | | | | | t3510: test that cherry-pick --abort does not unsafely change HEAD | Stephan Beyer | 2016-12-09 | |
| * | | | | | | | am: change safe_to_abort()'s not rewinding error into a warning | Stephan Beyer | 2016-12-08 | |
| * | | | | | | | am: fix filename in safe_to_abort() error message | Stephan Beyer | 2016-12-08 | |
* | | | | | | | | Second batch for 2.12 | Junio C Hamano | 2016-12-19 | |
* | | | | | | | | Merge branch 'kh/tutorial-grammofix' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | doc: omit needless "for" | Kristoffer Haugsbakk | 2016-12-09 | |
| * | | | | | | | | doc: make the intent of sentence clearer | Kristoffer Haugsbakk | 2016-12-09 | |
| * | | | | | | | | doc: add verb in front of command to run | Kristoffer Haugsbakk | 2016-12-09 | |
| * | | | | | | | | doc: add articles (grammar) | Kristoffer Haugsbakk | 2016-12-09 | |
| | |/ / / / / / | |/| | | | | | | ||||
* | | | | | | | | Merge branch 'da/mergetool-xxdiff-hotkey' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | mergetools: fix xxdiff hotkeys | David Aguilar | 2016-12-11 | |
* | | | | | | | | | Merge branch 'lr/doc-fix-cet' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | date-formats.txt: Typo fix | Luis Ressel | 2016-12-12 | |
* | | | | | | | | | | Merge branch 'sb/t3600-cleanup' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | t3600: slightly modernize style | Stefan Beller | 2016-12-12 | |
| * | | | | | | | | | | t3600: remove useless redirect | Stefan Beller | 2016-12-05 | |
* | | | | | | | | | | | Merge branch 'jc/pull-rebase-ff' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | pull: fast-forward "pull --rebase=true" | Junio C Hamano | 2016-11-29 | |
* | | | | | | | | | | | | Merge branch 'ld/p4-worktree' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | git-p4: support git worktrees | Luke Diamand | 2016-12-13 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge branch 'jk/make-tags-find-sources-tweak' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | Makefile: exclude contrib from FIND_SOURCE_FILES | Jeff King | 2016-12-14 | |
| * | | | | | | | | | | | | Makefile: match shell scripts in FIND_SOURCE_FILES | Jeff King | 2016-12-14 | |
| * | | | | | | | | | | | | Makefile: exclude test cruft from FIND_SOURCE_FILES | Jeff King | 2016-12-14 | |
| * | | | | | | | | | | | | Makefile: reformat FIND_SOURCE_FILES | Jeff King | 2016-12-14 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge branch 'js/normalize-path-copy-ceil' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | normalize_path_copy(): fix pushing to //server/share/dir on Windows | Johannes Sixt | 2016-12-16 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge branch 'bb/unicode-9.0' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | unicode_width.h: update the width tables to Unicode 9.0 | Beat Bolli | 2016-12-14 | |
| * | | | | | | | | | | | | update_unicode.sh: remove the plane filter | Beat Bolli | 2016-12-14 | |
| * | | | | | | | | | | | | update_unicode.sh: automatically download newer definition files | Beat Bolli | 2016-12-14 | |
| * | | | | | | | | | | | | update_unicode.sh: pin the uniset repo to a known good commit | Beat Bolli | 2016-12-13 | |
| * | | | | | | | | | | | | update_unicode.sh: remove an unnecessary subshell level | Beat Bolli | 2016-12-13 | |
| * | | | | | | | | | | | | update_unicode.sh: move it into contrib/update-unicode | Beat Bolli | 2016-12-13 | |
* | | | | | | | | | | | | | Merge branch 'jk/readme-gmane-is-no-more' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | README: replace gmane link with public-inbox | Jeff King | 2016-12-15 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'jc/lock-report-on-error' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | lockfile: LOCK_REPORT_ON_ERROR | Junio C Hamano | 2016-12-07 | |
| * | | | | | | | | | | | | | hold_locked_index(): align error handling with hold_lockfile_for_update() | Junio C Hamano | 2016-12-07 | |
| * | | | | | | | | | | | | | wt-status: implement opportunisitc index update correctly | Junio C Hamano | 2016-12-07 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'jk/xdiff-drop-xdl-fast-hash' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | xdiff: drop XDL_FAST_HASH | Jeff King | 2016-12-06 | |
| |/ / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | Merge branch 'nd/rebase-forget' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | rebase: add --quit to cleanup rebase, leave everything else untouched | Nguyễn Thái Ngọc Duy | 2016-12-11 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'jk/trailers-placeholder-in-pretty' | Junio C Hamano | 2016-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | ref-filter: add support to display trailers as part of contents | Jacob Keller | 2016-12-11 |