Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | am: fix filename in safe_to_abort() error message | Stephan Beyer | 2016-12-08 | 1 | -1/+1 | |
* | | | | | | | | Second batch for 2.12 | Junio C Hamano | 2016-12-19 | 1 | -3/+90 | |
* | | | | | | | | Merge branch 'kh/tutorial-grammofix' | Junio C Hamano | 2016-12-19 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | doc: omit needless "for"kh/tutorial-grammofix | Kristoffer Haugsbakk | 2016-12-09 | 1 | -1/+1 | |
| * | | | | | | | | doc: make the intent of sentence clearer | Kristoffer Haugsbakk | 2016-12-09 | 1 | -1/+1 | |
| * | | | | | | | | doc: add verb in front of command to run | Kristoffer Haugsbakk | 2016-12-09 | 1 | -1/+1 | |
| * | | | | | | | | doc: add articles (grammar) | Kristoffer Haugsbakk | 2016-12-09 | 1 | -3/+3 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'da/mergetool-xxdiff-hotkey' | Junio C Hamano | 2016-12-19 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | mergetools: fix xxdiff hotkeysda/mergetool-xxdiff-hotkey | David Aguilar | 2016-12-11 | 1 | -5/+5 | |
* | | | | | | | | | Merge branch 'lr/doc-fix-cet' | Junio C Hamano | 2016-12-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | date-formats.txt: Typo fixlr/doc-fix-cet | Luis Ressel | 2016-12-12 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'sb/t3600-cleanup' | Junio C Hamano | 2016-12-19 | 1 | -73/+51 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | t3600: slightly modernize stylesb/t3600-cleanup | Stefan Beller | 2016-12-12 | 1 | -73/+51 | |
| * | | | | | | | | | | t3600: remove useless redirect | Stefan Beller | 2016-12-05 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge branch 'jc/pull-rebase-ff' | Junio C Hamano | 2016-12-19 | 2 | -4/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | pull: fast-forward "pull --rebase=true"jc/pull-rebase-ff | Junio C Hamano | 2016-11-29 | 2 | -4/+35 | |
* | | | | | | | | | | | | Merge branch 'ld/p4-worktree' | Junio C Hamano | 2016-12-19 | 3 | -4/+65 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | git-p4: support git worktreesld/p4-worktree | Luke Diamand | 2016-12-13 | 3 | -4/+65 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jk/make-tags-find-sources-tweak' | Junio C Hamano | 2016-12-19 | 1 | -3/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Makefile: exclude contrib from FIND_SOURCE_FILESjk/make-tags-find-sources-tweak | Jeff King | 2016-12-14 | 1 | -0/+2 | |
| * | | | | | | | | | | | | Makefile: match shell scripts in FIND_SOURCE_FILES | Jeff King | 2016-12-14 | 1 | -1/+3 | |
| * | | | | | | | | | | | | Makefile: exclude test cruft from FIND_SOURCE_FILES | Jeff King | 2016-12-14 | 1 | -1/+7 | |
| * | | | | | | | | | | | | Makefile: reformat FIND_SOURCE_FILES | Jeff King | 2016-12-14 | 1 | -3/+6 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'js/normalize-path-copy-ceil' | Junio C Hamano | 2016-12-19 | 1 | -9/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | normalize_path_copy(): fix pushing to //server/share/dir on Windowsjs/normalize-path-copy-ceil | Johannes Sixt | 2016-12-16 | 1 | -9/+14 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'bb/unicode-9.0' | Junio C Hamano | 2016-12-19 | 6 | -65/+163 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | unicode_width.h: update the width tables to Unicode 9.0bb/unicode-9.0 | Beat Bolli | 2016-12-14 | 1 | -24/+107 | |
| * | | | | | | | | | | | | update_unicode.sh: remove the plane filter | Beat Bolli | 2016-12-14 | 1 | -2/+1 | |
| * | | | | | | | | | | | | update_unicode.sh: automatically download newer definition files | Beat Bolli | 2016-12-14 | 1 | -6/+2 | |
| * | | | | | | | | | | | | update_unicode.sh: pin the uniset repo to a known good commit | Beat Bolli | 2016-12-13 | 1 | -1/+2 | |
| * | | | | | | | | | | | | update_unicode.sh: remove an unnecessary subshell level | Beat Bolli | 2016-12-13 | 1 | -27/+26 | |
| * | | | | | | | | | | | | update_unicode.sh: move it into contrib/update-unicode | Beat Bolli | 2016-12-13 | 4 | -6/+26 | |
* | | | | | | | | | | | | | Merge branch 'jk/readme-gmane-is-no-more' | Junio C Hamano | 2016-12-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | README: replace gmane link with public-inboxjk/readme-gmane-is-no-more | Jeff King | 2016-12-15 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jc/lock-report-on-error' | Junio C Hamano | 2016-12-19 | 22 | -36/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | lockfile: LOCK_REPORT_ON_ERROR | Junio C Hamano | 2016-12-07 | 3 | -4/+18 | |
| * | | | | | | | | | | | | | hold_locked_index(): align error handling with hold_lockfile_for_update() | Junio C Hamano | 2016-12-07 | 18 | -29/+27 | |
| * | | | | | | | | | | | | | wt-status: implement opportunisitc index update correctly | Junio C Hamano | 2016-12-07 | 1 | -3/+4 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/xdiff-drop-xdl-fast-hash' | Junio C Hamano | 2016-12-19 | 3 | -118/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | xdiff: drop XDL_FAST_HASHjk/xdiff-drop-xdl-fast-hash | Jeff King | 2016-12-06 | 3 | -118/+0 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'nd/rebase-forget' | Junio C Hamano | 2016-12-19 | 4 | -4/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | rebase: add --quit to cleanup rebase, leave everything else untouchednd/rebase-forget | Nguyễn Thái Ngọc Duy | 2016-12-11 | 4 | -4/+37 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/trailers-placeholder-in-pretty' | Junio C Hamano | 2016-12-19 | 6 | -1/+93 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | ref-filter: add support to display trailers as part of contentsjk/trailers-placeholder-in-pretty | Jacob Keller | 2016-12-11 | 3 | -1/+49 | |
| * | | | | | | | | | | | | | pretty: add %(trailers) format for displaying trailers of a commit message | Jacob Keller | 2016-12-11 | 3 | -0/+45 | |
* | | | | | | | | | | | | | | Merge branch 'ak/commit-only-allow-empty' | Junio C Hamano | 2016-12-19 | 3 | -4/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | commit: remove 'Clever' message for --only --amendak/commit-only-allow-empty | Andreas Krey | 2016-12-09 | 1 | -2/+0 | |
| * | | | | | | | | | | | | | | commit: make --only --allow-empty work without paths | Andreas Krey | 2016-12-05 | 3 | -2/+12 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'da/difftool-dir-diff-fix' | Junio C Hamano | 2016-12-19 | 2 | -3/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | difftool: fix dir-diff index creation when in a subdirectoryda/difftool-dir-diff-fix | David Aguilar | 2016-12-08 | 2 | -3/+45 | |
| |/ / / / / / / / / / / / / |