aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
...
| * | | | | | | | | Merge branch 'mg/timestamp-t-fix' into maintJunio C Hamano2017-10-18
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-10-18
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/describe-omit-some-refs' into maintJunio C Hamano2017-10-18
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'aw/gc-lockfile-fscanf-fix' into maintJunio C Hamano2017-10-18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rk/commit-tree-make-F-verbatim' into maintJunio C Hamano2017-10-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/packed-ref-store-prep' into maintJunio C Hamano2017-10-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/misc-resolve-ref-unsafe-fixes'Junio C Hamano2017-11-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | remote: handle broken symrefsJeff King2017-10-21
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jc/no-cmd-as-subroutine'Junio C Hamano2017-11-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | merge-ours: do not use cmd_*() as a subroutineJunio C Hamano2017-10-11
| * | | | | | | | | | | | | | | | describe: do not use cmd_*() as a subroutineJunio C Hamano2017-10-11
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ma/lockfile-fixes'Junio C Hamano2017-11-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | read-cache: leave lock in right state in `write_locked_index()`Martin Ågren2017-10-07
| * | | | | | | | | | | | | | | read-cache: drop explicit `CLOSE_LOCK`-flagMartin Ågren2017-10-07
| * | | | | | | | | | | | | | | apply: move lockfile into `apply_state`Martin Ågren2017-10-06
| * | | | | | | | | | | | | | | checkout-index: simplify locking logicMartin Ågren2017-10-06
| * | | | | | | | | | | | | | | treewide: prefer lockfiles on the stackMartin Ågren2017-10-06
* | | | | | | | | | | | | | | | Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | tag: respect color.ui configJeff King2017-10-17
| * | | | | | | | | | | | | | Revert "color: check color.ui in git_default_config()"Jeff King2017-10-17
| * | | | | | | | | | | | | | Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano2017-10-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ds/avoid-overflow-in-midpoint-computation'Junio C Hamano2017-10-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | cleanup: fix possible overflow errors in binary searchDerrick Stolee2017-10-10
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ks/branch-tweak-error-message-for-extra-args'Junio C Hamano2017-10-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | branch: change the error messages to be more meaningfulKaartic Sivaraam2017-10-04
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/ui-color-always-to-auto'Junio C Hamano2017-10-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autoJunio C Hamano2017-10-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | provide --color option for all ref-filter usersJeff King2017-10-04
* | | | | | | | | | | | | | | | Merge branch 'ma/builtin-unleak'Junio C Hamano2017-10-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | builtin/: add UNLEAKsMartin Ågren2017-10-02
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'sb/branch-avoid-repeated-strbuf-release'Junio C Hamano2017-10-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | branch: reset instead of release a strbufStefan Beller2017-10-04
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano2017-10-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | use strbuf_addstr() for adding strings to strbufsRené Scharfe2017-10-02
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano2017-10-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | refs: pass NULL to resolve_refdup() if hash is not neededRené Scharfe2017-10-01
* | | | | | | | | | | | | | Merge branch 'jk/read-in-full'Junio C Hamano2017-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | worktree: check the result of read_in_full()Jeff King2017-09-27
| * | | | | | | | | | | | | | worktree: use xsize_t to access file sizeJeff King2017-09-27
| * | | | | | | | | | | | | | distinguish error versus short read from read_in_full()Jeff King2017-09-27
| * | | | | | | | | | | | | | prefer "!=" when checking read_in_full() resultJeff King2017-09-27
* | | | | | | | | | | | | | | Merge branch 'jk/no-optional-locks'Junio C Hamano2017-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git: add --no-optional-locks optionJeff King2017-09-27
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sd/branch-copy'Junio C Hamano2017-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | branch: fix "copy" to never touch HEADJunio C Hamano2017-09-24
| * | | | | | | | | | | | | | | branch: add a --copy (-c) option to go with --move (-m)Sahil Dua2017-06-18
* | | | | | | | | | | | | | | | Merge branch 'bc/rev-parse-parseopt-fix'Junio C Hamano2017-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rev-parse parseopt: interpret any whitespace as start of help textBrandon Casey2017-09-19
| * | | | | | | | | | | | | | | | rev-parse parseopt: do not search help text for flag charsBrandon Casey2017-09-19
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |