aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | Merge branch 'nd/index-pack-one-fd-per-thread' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | index-pack: work around thread-unsafe pread()Nguyễn Thái Ngọc Duy2014-04-16
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git grep -O -i: if the pager is 'less', pass the '-I' optionJohannes Schindelin2014-05-15
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/daemonize-gc' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gc --auto: do not lock refs in the backgroundNguyễn Thái Ngọc Duy2014-05-27
* | | | | | | | | | | | | Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | move "--follow needs one pathspec" rule to diff_setup_doneJeff King2014-05-20
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | commit: do not complain of empty messages from -CJeff King2014-04-28
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | blame: correctly handle files regardless of autocrlfbrian m. carlson2014-05-08
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jx/blame-align-relative-time' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | blame: dynamic blame_date_width for different localesJiang Xin2014-04-23
| * | | | | | | | | | | | | blame: fix broken time_buf paddings in relative timestampJiang Xin2014-04-23
* | | | | | | | | | | | | | Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | apply --ignore-space-change: lines with and without leading whitespaces do no...Junio C Hamano2014-03-26
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maintJunio C Hamano2014-06-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | update-index: fix segfault with missing --cacheinfo argumentJeff King2014-06-04
* | | | | | | | | | | | | | i18n: only extract comments marked with "TRANSLATORS:"Jiang Xin2014-04-17
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-04-08
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pack-objects: do not reuse packfiles without --delta-base-offsetJeff King2014-04-04
* | | | | | | | | | | | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | code and test: fix misuses of "nor"Justin Lebar2014-03-31
| * | | | | | | | | | | | | comments: fix misuses of "nor"Justin Lebar2014-03-31
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ds/rev-parse-required-args' into maintJunio C Hamano2014-03-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano2014-03-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'mh/update-ref-batch-create-fix'Junio C Hamano2014-04-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | update-ref: fail create operation over stdin if ref already existsAman Gupta2014-04-02
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-04-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | update-index: teach --cacheinfo a new syntax "mode,sha1,path"Junio C Hamano2014-03-24
| * | | | | | | | | | | | | | | parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-24
* | | | | | | | | | | | | | | | Merge branch 'nd/gc-aggressive'Junio C Hamano2014-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | gc --aggressive: make --depth configurableNguyễn Thái Ngọc Duy2014-03-31
* | | | | | | | | | | | | | | | | Merge branch 'nd/log-show-linear-break'Junio C Hamano2014-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | object.h: centralize object flag allocationNguyễn Thái Ngọc Duy2014-03-25
* | | | | | | | | | | | | | | | | | Merge branch 'ib/rev-parse-parseopt-argh'Junio C Hamano2014-03-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | rev-parse --parseopt: option argument name hintsIlya Bobyr2014-03-23
* | | | | | | | | | | | | | | | | | Merge branch 'bp/commit-p-editor'Junio C Hamano2014-03-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-18
| * | | | | | | | | | | | | | | | | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-18
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | 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/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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |