Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ab/help-config-vars' | Junio C Hamano | 2021-10-13 | 1 | -4/+5 |
|\ | |||||
| * | help: correct logic error in combining --all and --config | Ævar Arnfjörð Bjarmason | 2021-09-23 | 1 | -0/+1 |
| * | help: correct usage & behavior of "git help --guides" | Ævar Arnfjörð Bjarmason | 2021-09-23 | 1 | -3/+3 |
| * | help: correct the usage string in -h and documentation | Ævar Arnfjörð Bjarmason | 2021-09-10 | 1 | -1/+1 |
* | | Merge branch 'jh/builtin-fsmonitor-part1' | Junio C Hamano | 2021-10-13 | 1 | -0/+40 |
|\ \ | |||||
| * | | trace2: add trace2_child_ready() to report on background children | Jeff Hostetler | 2021-09-20 | 1 | -0/+40 |
* | | | Merge branch 'en/removing-untracked-fixes' | Junio C Hamano | 2021-10-13 | 3 | -22/+9 |
|\ \ \ | |||||
| * | | | Documentation: call out commands that nuke untracked files/directories | Elijah Newren | 2021-09-27 | 3 | -5/+8 |
| * | | | read-tree, merge-recursive: overwrite ignored files by default | Elijah Newren | 2021-09-27 | 1 | -17/+1 |
| * | | | Merge branch 'en/am-abort-fix' into en/removing-untracked-fixes | Junio C Hamano | 2021-09-20 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |/| | | |||||
* | | | | Merge branch 'ds/add-rm-with-sparse-index' | Junio C Hamano | 2021-10-13 | 2 | -1/+14 |
|\ \ \ \ | |||||
| * | | | | rm: add --sparse option | Derrick Stolee | 2021-09-28 | 1 | -0/+6 |
| * | | | | add: implement the --sparse option | Derrick Stolee | 2021-09-28 | 1 | -1/+8 |
* | | | | | Sync with Git 2.33.1 | Junio C Hamano | 2021-10-12 | 2 | -75/+138 |
|\ \ \ \ \ | |||||
| * | | | | | Git 2.33.1v2.33.1 | Junio C Hamano | 2021-10-12 | 1 | -0/+138 |
| * | | | | | Merge branch 'cb/cvsserver' into maint | Junio C Hamano | 2021-10-12 | 1 | -14/+13 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'en/am-abort-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge branch 'jk/log-warn-on-bogus-encoding' into maint | Junio C Hamano | 2021-10-12 | 2 | -3/+5 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ka/want-ref-in-namespace' into maint | Junio C Hamano | 2021-10-12 | 1 | -5/+9 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'sg/column-nl' into maint | Junio C Hamano | 2021-10-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rs/branch-allow-deleting-dangling' into maint | Junio C Hamano | 2021-10-12 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'en/pull-conflicting-options' into maint | Junio C Hamano | 2021-10-12 | 3 | -9/+54 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'po/git-config-doc-mentions-help-c' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ma/doc-git-version' into maint | Junio C Hamano | 2021-10-12 | 2 | -0/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bs/doc-bugreport-outdir' into maint | Junio C Hamano | 2021-10-12 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/walken-tutorial-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'en/merge-strategy-docs' into maint | Junio C Hamano | 2021-10-12 | 4 | -40/+53 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/bundle-doc' into maint | Junio C Hamano | 2021-10-12 | 1 | -30/+117 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | Twelfth batch | Junio C Hamano | 2021-10-11 | 1 | -0/+7 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/ref-paranoia' | Junio C Hamano | 2021-10-11 | 1 | -9/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | refs: turn on GIT_REF_PARANOIA by default | Jeff King | 2021-09-27 | 1 | -9/+10 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'tb/midx-write-propagate-namehash' | Junio C Hamano | 2021-10-11 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | midx.c: respect 'pack.writeBitmapHashcache' when writing bitmaps | Taylor Blau | 2021-09-14 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | | | | | The eleventh batch | Junio C Hamano | 2021-10-06 | 1 | -0/+9 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'os/status-docfix' | Junio C Hamano | 2021-10-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | doc: fix capitalization in "git status --porcelain=v2" description | Orgad Shaneh | 2021-09-28 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ws/refer-to-forkpoint-config-in-rebase-doc' | Junio C Hamano | 2021-10-06 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | Document `rebase.forkpoint` in rebase man page | Wesley Schwengle | 2021-09-20 | 1 | -1/+2 |
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'gc/doc-first-contribution-reroll' | Junio C Hamano | 2021-10-06 | 1 | -11/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | MyFirstContribution: Document --range-diff option when writing v2 | Glen Choo | 2021-09-22 | 1 | -11/+31 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/midx-doc-update' | Junio C Hamano | 2021-10-06 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | doc/technical: update note about core.multiPackIndex | Eric Wong | 2021-09-24 | 1 | -1/+3 |
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/commit-graph-usage-fix' | Junio C Hamano | 2021-10-06 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | builtin/multi-pack-index.c: disable top-level --[no-]progress | Taylor Blau | 2021-09-22 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | The tenth batch | Junio C Hamano | 2021-10-03 | 1 | -0/+34 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/cvsserver' | Junio C Hamano | 2021-10-03 | 1 | -14/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Documentation: cleanup git-cvsserver | Carlo Marcelo Arenas Belón | 2021-09-16 | 1 | -8/+9 |
| * | | | | | | | | | | | | | | | | | | | | | | git-cvsserver: use crypt correctly to compare password hashes | Carlo Marcelo Arenas Belón | 2021-09-16 | 1 | -6/+4 |
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | The ninth batch | Junio C Hamano | 2021-09-28 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/reduce-malloc-in-v2-servers' | Junio C Hamano | 2021-09-28 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |