Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
323 commits
Select commit Hold shift + click to select a range
556ee9a
CMake: show Win32 and Generator_platform build-option values
PhilipOakley May 10, 2021
f928046
init: do parse _all_ core.* settings early
dscho Sep 8, 2021
9045c1c
hash-object: demonstrate a >4GB/LLP64 problem
PhilipOakley Oct 31, 2021
6c951e9
object-file.c: use size_t for header lengths
PhilipOakley Nov 12, 2021
f894aeb
hash algorithms: use size_t for section lengths
PhilipOakley Nov 12, 2021
bd9c1fd
hash-object --stdin: verify that it works with >4GB/LLP64
PhilipOakley Dec 6, 2021
ce36254
hash-object: add another >4GB/LLP64 test case
PhilipOakley Dec 6, 2021
b03c2d4
setup: properly use "%(prefix)/" when in WSL
derrickstolee Apr 13, 2022
a15590b
hash-object: add a >4GB/LLP64 test case using filtered input
PhilipOakley Dec 7, 2021
3b395fa
compat/mingw.c: do not warn when failing to get owner
derrickstolee Apr 13, 2022
40fab90
mingw: $env:TERM="xterm-256color" for newer OSes
rkitover Apr 12, 2022
927c3d2
winansi: check result and Buffer before using Name
1480c1 May 28, 2022
efb3230
Add config option `windows.appendAtomically`
sunzhuoshi Jan 15, 2022
40b2ad3
mingw: change core.fsyncObjectFiles = 1 by default
dscho Sep 4, 2017
4576f9b
MinGW: link as terminal server aware
rimrul Jul 10, 2022
8c6dc92
Fix Windows version resources
Mortein Nov 2, 2022
76cd0fd
status: fix for old-style submodules with commondir
sceptical-coder Oct 28, 2022
4f33fd4
http: optionally load libcurl lazily
dscho May 6, 2023
6de1f27
http: support lazy-loading libcurl also on Windows
dscho May 7, 2023
3973083
http: when loading libcurl lazily, allow for multiple SSL backends
dscho May 7, 2023
97ad9af
windows: skip linking `git-<command>` for built-ins
dscho Jan 27, 2023
b051fa3
mingw: do load libcurl dynamically by default
dscho May 7, 2023
b5ef892
Add a GitHub workflow to verify that Git/Scalar work in Nano Server
dscho Nov 2, 2022
532f817
mingw: suggest `windows.appendAtomically` in more cases
dsl101 Jul 28, 2023
4af874f
win32: use native ANSI sequence processing, if possible
dscho Nov 22, 2023
09dee95
git.rc: include winuser.h
rimrul Dec 2, 2023
6e4969b
common-main.c: fflush stdout buffer upon exit
chengzhuo5 Apr 8, 2024
cd07062
t5601/t7406(mingw): do run tests with symlink support
dscho Apr 9, 2024
f1f79b1
win32: ensure that `localtime_r()` is declared even in i686 builds
dscho May 21, 2024
a92fab5
Fallback to AppData if XDG_CONFIG_HOME is unset
ariellourenco Jul 2, 2024
3381c85
survey: stub in new experimental 'git-survey' command
Apr 29, 2024
0e50a44
survey: add command line opts to select references
Apr 29, 2024
3934f1d
survey: start pretty printing data in table form
derrickstolee Sep 1, 2024
e07c826
survey: add object count summary
derrickstolee Sep 2, 2024
2f55955
survey: summarize total sizes by object type
derrickstolee Sep 2, 2024
7fd7e2b
survey: show progress during object walk
derrickstolee Sep 2, 2024
69ba498
run-command: be helpful with Git LFS fails on Windows 7
dscho Jul 4, 2024
c22b4a8
revision: create mark_trees_uninteresting_dense()
derrickstolee Sep 6, 2024
0a4aae8
ci: work around a problem with HTTP/2 vs libcurl v8.10.0
dscho Sep 24, 2024
ba13ac4
mingw: make sure `errno` is set correctly when socket operations fail
dscho Nov 14, 2019
fb960b4
survey: add ability to track prioritized lists
derrickstolee Sep 2, 2024
da954fc
compat/mingw: handle WSA errors in strerror
rimrul Dec 22, 2024
dd6e9be
survey: add report of "largest" paths
derrickstolee Sep 2, 2024
0e8e705
compat/mingw: drop outdated comment
rimrul Dec 22, 2024
b41b540
survey: add --top=<N> option and config
derrickstolee Sep 23, 2024
3be1722
t0301: actually test credential-cache on Windows
rimrul Dec 29, 2024
43014e6
survey: clearly note the experimental nature in the output
dscho Jul 1, 2024
ef98952
credential-cache: handle ECONNREFUSED gracefully
rimrul Dec 22, 2024
09809ec
max_tree_depth: lower it for clangarm64 on Windows
dscho Apr 15, 2025
5e4609a
Merge branch 'reftable-vs-cmake'
dscho Aug 3, 2025
38f0f6f
Merge branch 'organize-mingw-includes'
dscho Jun 2, 2025
8b88631
reftable: do make sure to use custom allocators
dscho Mar 6, 2025
f2be3df
check-whitespace: avoid alerts about upstream commits
dscho Jun 3, 2025
30716cb
refs: forbid clang to complain about unreachable code
dscho Jun 4, 2025
dba461b
mingw: avoid the comma operator
dscho Jun 5, 2025
fb3d387
Merge 'remote-hg-prerequisites' into HEAD
dscho Jun 8, 2018
b9ae089
Merge branch 'drive-prefix'
dscho Jun 8, 2018
59ff7f3
Merge branch 'dont-clean-junctions'
dscho Jul 30, 2019
bed7255
Merge branch 'msys2-python'
dscho May 31, 2019
7ed7fda
Merge branch 'mimalloc-v2.2.3'
dscho Sep 8, 2022
d62c57c
Merge pull request #2375 from assarbad/reintroduce-sideband-config
dscho Oct 30, 2019
f1c8e53
Merge pull request #2449 from dscho/mingw-getcwd-and-symlinks
dscho Jan 3, 2020
3091474
Merge pull request #2488 from bmueller84/master
dscho Jan 22, 2020
1f1cf82
Merge pull request #2501 from jeffhostetler/clink-debug-curl
dscho Jan 30, 2020
3e2d7ae
Merge pull request #2504 from dscho/access-repo-via-junction
dscho Feb 1, 2020
71ab196
Merge pull request #2506 from dscho/issue-2283
dscho Feb 11, 2020
c6c754d
Merge pull request #2535 from dscho/schannel-revoke-best-effort
dscho Mar 4, 2020
1faa22c
Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master
dscho May 9, 2020
4035308
Merge 'add-p-many-files'
dscho Jun 8, 2018
6084a98
Merge pull request #2714 from lbonanomi/crlf-scissors
dscho Jul 3, 2020
643922f
Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info
dscho Oct 9, 2020
fb505ad
Merge 'git-gui/js/intent-to-add'
dscho Oct 18, 2020
6fde81e
Merge pull request #2974 from derrickstolee/maintenance-and-headless
dscho Jan 11, 2021
338cdc9
cmake: install headless-git. (#4338)
dscho Mar 13, 2023
a9d5cae
Merge pull request #2351 from PhilipOakley/vcpkg-tip
dscho Oct 7, 2019
3e2828a
Merge pull request #2915 from dennisameling/windows-arm64-support
dscho Dec 9, 2020
247fd1a
Merge pull request #3327 from dennisameling/fix-host-cpu
dscho Jul 19, 2021
13b54d8
Merge pull request #3165 from dscho/increase-allowed-length-of-interp…
dscho Apr 3, 2021
976f6ba
Merge pull request #3220 from dscho/there-is-no-vs/master-anymore
dscho May 17, 2021
4d8b6c7
Merge pull request #3293 from pascalmuller/http-support-automatically…
dscho Jun 24, 2021
a1691f0
Merge pull request #3349 from vdye/feature/ci-subtree-tests
dscho Aug 10, 2021
6a0a9e0
Merge pull request #3306 from PhilipOakley/vs-sln
dscho Oct 12, 2021
d26e3f2
Merge pull request #3417 from dscho/initialize-core.symlinks-earlier
dscho Oct 13, 2021
42ef5df
Merge pull request #3533 from PhilipOakley/hashliteral_t
dscho Dec 15, 2021
38ad261
Merge pull request #3791: Various fixes around `safe.directory`
derrickstolee Apr 13, 2022
e76d558
Merge pull request #3751 from rkitover/native-term
dscho Apr 21, 2022
e8b5f6b
Merge pull request #3875 from 1480c1/wine/detect_msys_tty
dscho May 30, 2022
42a7a95
Merge branch 'optionally-dont-append-atomically-on-windows'
dscho Jun 23, 2022
65618a8
Merge branch 'fsync-object-files-always'
dscho Oct 11, 2018
3b52555
Merge pull request #3942 from rimrul/mingw-tsaware
dscho Jul 27, 2022
18831de
Fix Windows version resources (#4092)
dscho Nov 3, 2022
7f9f896
Fix global repository field not being cleared (#4083)
dscho Dec 20, 2022
f25d2a5
Skip linking the "dashed" `git-<command>`s for built-ins (#4252)
dscho Jan 31, 2023
871f5e2
Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (…
dscho May 15, 2023
14992ea
Merge branch 'nano-server'
dscho Aug 7, 2023
f901a38
Additional error checks for issuing the windows.appendAtomically warn…
dscho Aug 7, 2023
8b0dd17
win32: use native ANSI sequence processing, if possible (#4700)
dscho Dec 2, 2023
e93dd17
ARM64: Embed manifest properly (#4718)
dscho Dec 7, 2023
be78cfd
common-main.c: fflush stdout buffer when exit (#4901)
dscho Apr 12, 2024
345f062
Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
dscho Jul 12, 2024
4c045df
Merge branch 'Fix-i686-build-with-GCC-v14'
dscho Jul 12, 2024
7a3f90a
Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
dscho Jul 12, 2024
ad32112
Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
dscho Jul 12, 2024
e07bca6
pack-objects: create new name-hash algorithm (#5157)
dscho Sep 24, 2024
85fa042
Add path walk API and its use in 'git pack-objects' (#5171)
derrickstolee Sep 25, 2024
4002dac
Add experimental 'git survey' builtin (#5174)
dscho Sep 26, 2024
98e9110
credential-cache: handle ECONNREFUSED gracefully (#5329)
dscho Jan 1, 2025
4b68f63
clangarm64: let the tests pass! (#5586)
dscho Apr 21, 2025
c4f3af6
Merge branch 'reftable-vs-custom-allocators'
dscho Jun 2, 2025
0101049
Merge branch 'check-whitespace-only-downstream'
dscho Jun 3, 2025
ccd9d12
Merge branch 'refs-clang-fix'
dscho Jun 11, 2025
5ae15d8
mingw: avoid the comma operator (#5660)
dscho Jun 5, 2025
46e7598
git-gui: provide question helper for retry fallback on Windows
hvoigt Feb 21, 2010
0da92a7
git gui: set GIT_ASKPASS=git-gui--askpass if not set yet
dscho Jul 23, 2010
a90354a
Merge branch 'ready-for-upstream'
dscho Oct 11, 2018
d9b51f2
Win32: make FILETIME conversion functions public
kblees Jul 6, 2013
dbeae5c
git-gui--askyesno: fix funny text wrapping
dscho Sep 20, 2017
696c5a0
Win32: dirent.c: Move opendir down
kblees Sep 8, 2013
b6112a4
git-gui--askyesno: allow overriding the window title
dscho Sep 20, 2017
ab11246
mingw: make the dirent implementation pluggable
kblees Sep 8, 2013
61f14f8
git-gui--askyesno (mingw): use Git for Windows' icon, if available
dscho Sep 20, 2017
29e3ecb
Merge 'git-gui' into HEAD
dscho Jun 7, 2018
08300ee
Win32: make the lstat implementation pluggable
kblees Sep 8, 2013
bb0af5a
Merge branch 'git-gui-askyesno'
dscho Jun 8, 2018
7efd91b
mingw: add infrastructure for read-only file system level caches
kblees Sep 8, 2013
6ed9c53
mingw: add a cache below mingw's lstat and dirent implementations
kblees Oct 1, 2013
2a6fd3e
fscache: load directories only once
kblees Jun 24, 2014
fab5fca
fscache: add key for GIT_TRACE_FSCACHE
jeffhostetler Jan 24, 2017
b7f3f07
fscache: remember not-found directories
jeffhostetler Dec 13, 2016
fff2fb2
fscache: add a test for the dir-not-found optimization
dscho Jan 25, 2017
5186e0d
add: use preload-index and fscache for performance
jeffhostetler Nov 22, 2016
73b0f2e
dir.c: make add_excludes aware of fscache during status
jeffhostetler Nov 1, 2017
1072880
fscache: make fscache_enabled() public
jeffhostetler Dec 20, 2017
8ce8c3d
dir.c: regression fix for add_excludes with fscache
jeffhostetler Dec 20, 2017
27e8d04
fetch-pack.c: enable fscache for stats under .git/objects
Nov 22, 2017
1a66b5b
checkout.c: enable fscache for checkout again
Jan 30, 2018
ca5571f
mem_pool: add GIT_TRACE_MEMPOOL support
benpeart Oct 4, 2018
10ef6cd
Enable the filesystem cache (fscache) in refresh_index().
benpeart Sep 7, 2018
d75382d
fscache: fscache takes an initial size
benpeart Nov 2, 2018
6f3fc5a
fscache: use FindFirstFileExW to avoid retrieving the short name
benpeart Oct 23, 2018
deece30
fscache: update fscache to be thread specific instead of global
benpeart Oct 4, 2018
9eab0e1
fscache: add GIT_TEST_FSCACHE support
benpeart Oct 4, 2018
6444fa4
fscache: teach fscache to use mempool
benpeart Nov 2, 2018
b1adcc2
fscache: add fscache hit statistics
benpeart Sep 25, 2018
555a3dc
fscache: make fscache_enable() thread safe
benpeart Nov 16, 2018
b36789b
unpack-trees: enable fscache for sparse-checkout
derrickstolee Jun 12, 2019
472de6c
status: disable and free fscache at the end of the status command
benpeart Nov 1, 2018
d0fc190
fscache: teach fscache to use NtQueryDirectoryFile
benpeart Nov 15, 2018
0357b25
fscache: remember the reparse tag for each entry
dscho Dec 11, 2018
3a54a26
Merge branch 'fscache'
dscho Nov 15, 2018
55714e3
fscache: implement an FSCache-aware is_mount_point()
dscho Dec 11, 2018
b0c07cb
Merge pull request #1909 from benpeart/free-fscache-after-status-gfw
dscho Nov 5, 2018
c874ef5
clean: make use of FSCache
dscho Dec 11, 2018
020ba66
Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
dscho Nov 16, 2018
6abdaf6
Merge branch 'dont-clean-junctions-fscache'
dscho Jul 23, 2019
650e017
pack-objects (mingw): demonstrate a segmentation fault with large deltas
vangdfang Jan 9, 2014
40ebafc
mingw: support long paths
kblees Jul 28, 2015
31c4fcb
Win32: fix 'lstat("dir/")' with long paths
kblees Jul 4, 2014
745067f
win32(long path support): leave drive-less absolute paths intact
dscho Sep 6, 2023
c3815c5
mingw: Support `git_terminal_prompt` with more terminals
kblees Mar 19, 2015
65d2fd0
compat/fsmonitor/fsm-*-win32: support long paths
jeffhostetler Mar 25, 2022
e2ddf4a
compat/terminal.c: only use the Windows console if bash 'read -r' fails
kblees May 9, 2015
c495840
clean: suggest using `core.longPaths` if paths are too long to remove
mathstuf Apr 22, 2022
20e7455
mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
dscho Feb 23, 2018
f369b92
strbuf_readlink: don't call readlink twice if hint is the exact link …
kblees May 11, 2015
158d62b
strbuf_readlink: support link targets that exceed PATH_MAX
kblees May 11, 2015
941a919
lockfile.c: use is_dir_sep() instead of hardcoded '/' checks
kblees May 11, 2015
1f02c03
Win32: don't call GetFileAttributes twice in mingw_lstat()
kblees May 12, 2015
7058393
Win32: implement stat() with symlink support
kblees May 15, 2015
e645a22
Win32: remove separate do_lstat() function
kblees May 11, 2015
5d5a431
Win32: let mingw_lstat() error early upon problems with reparse points
kblees May 23, 2015
6912ec5
mingw: teach fscache and dirent about symlinks
kblees Jan 10, 2017
264fdd2
Win32: lstat(): return adequate stat.st_size for symlinks
kblees May 15, 2015
ab115d7
Win32: factor out retry logic
kblees May 19, 2015
4919918
Win32: change default of 'core.symlinks' to false
kblees May 23, 2015
9716364
Win32: add symlink-specific error codes
kblees May 15, 2015
3e28737
Win32: mingw_unlink: support symlinks to directories
kblees May 23, 2015
28128d2
Win32: mingw_rename: support renaming symlinks
kblees May 19, 2015
a31565a
Win32: mingw_chdir: change to symlink-resolved directory
kblees May 23, 2015
4f6849e
Win32: implement readlink()
kblees May 23, 2015
73d5ce2
mingw: lstat: compute correct size for symlinks
billziss-gh May 28, 2020
e683ea8
Win32: implement basic symlink() functionality (file symlinks only)
kblees May 23, 2015
02fa22f
Win32: symlink: add support for symlinks to directories
kblees May 23, 2015
8d24c5f
mingw: introduce code to detect whether we're inside a Windows container
zcube Apr 23, 2018
3e7543f
mingw: try to create symlinks without elevated permissions
dscho May 30, 2017
a5e7117
mingw: when running in a Windows container, try to rename() harder
zcube Apr 23, 2018
fc793fa
mingw: emulate stat() a little more faithfully
dscho Mar 2, 2020
727d08d
mingw: move the file_attr_to_st_mode() function definition
zcube Apr 23, 2018
038fe97
mingw: special-case index entries for symlinks with buggy size
dscho Jun 4, 2020
20ba818
mingw: Windows Docker volumes are *not* symbolic links
dscho Apr 23, 2018
70cf078
mingw: explicitly specify with which cmd to prefix the cmdline
dscho Jul 20, 2017
c5c378e
mingw: when path_lookup() failed, try BusyBox
dscho Jul 20, 2017
4fa3b41
Win32: symlink: move phantom symlink creation to a separate function
piscisaureus Oct 26, 2018
b9a659d
test-tool: learn to act as a drop-in replacement for `iconv`
dscho Jul 20, 2017
3679008
Introduce helper to create symlinks that knows about index_state
dscho Feb 11, 2019
6cea18e
tests(mingw): if `iconv` is unavailable, use `test-helper --iconv`
dscho Jul 20, 2017
4b2a258
mingw: allow to specify the symlink type in .gitattributes
piscisaureus Oct 26, 2018
975447c
gitattributes: mark .png files as binary
dscho Oct 11, 2018
b6f9d9e
mingw: work around rename() failing on a read-only file
dsl101 Jul 28, 2023
be796d6
Win32: symlink: add test for `symlink` attribute
piscisaureus Oct 26, 2018
dba20e5
tests: move test PNGs into t/lib-diff/
dscho Aug 5, 2017
7cdf174
tests: only override sort & find if there are usable ones in /usr/bin/
dscho Jul 17, 2017
68b21d8
tests: use the correct path separator with BusyBox
dscho Nov 19, 2018
d439a06
mingw: only use Bash-ism `builtin pwd -W` when available
dscho Jun 29, 2017
13d7d58
tests (mingw): remove Bash-specific pwd option
dscho Jun 30, 2017
a022b39
test-lib: add BUSYBOX prerequisite
dscho Jul 19, 2017
3bb87fa
t5003: use binary file from t/lib-diff/
dscho Aug 5, 2017
3cdc97e
t5532: workaround for BusyBox on Windows
dscho Jul 21, 2017
6a4f5ae
t5605: special-case hardlink test for BusyBox-w32
dscho Jul 21, 2017
e1f2444
t5813: allow for $PWD to be a Windows path
dscho Jul 5, 2017
f3a681d
t9200: skip tests when $PWD contains a colon
dscho Jul 7, 2017
ba30079
mingw: kill child processes in a gentler way
dscho May 17, 2017
738007a
mingw: add a Makefile target to copy test artifacts
dscho Jul 19, 2017
d8a69fd
mingw: optionally enable wsl compability file mode bits
swigger Jun 7, 2023
cd438e2
mingw: really handle SIGINT
dscho Apr 22, 2018
b0f1b34
mingw: do not call xutftowcs_path in mingw_mktemp
neerajsi-msft Oct 27, 2021
7d034df
Add a GitHub workflow to monitor component updates
dscho Sep 29, 2020
ede12ad
Partially un-revert "editor: save and reset terminal after calling ED…
dscho Nov 25, 2021
28aa1d6
reset: reinstate support for the deprecated --stdin option
dscho Dec 10, 2019
e1f183e
fsmonitor: reintroduce core.useBuiltinFSMonitor
vdye Apr 4, 2022
c5a0a3c
dependabot: help keeping GitHub Actions versions up to date
dscho Feb 6, 2024
3d9a042
Describe Git for Windows' architecture [no ci]
dscho Feb 13, 2023
a6ceaf2
Modify the Code of Conduct for Git for Windows
dscho Oct 11, 2019
70327a1
CONTRIBUTING.md: add guide for first-time contributors
derrickstolee Mar 1, 2018
d1874ce
README.md: Add a Windows-specific preamble
dscho Jan 10, 2014
c9c8e0e
Add an issue template
shiftkey Feb 18, 2016
da13873
Merge branch 'gitk-and-git-gui-patches'
dscho Oct 11, 2018
cb2a7f3
Modify the GitHub Pull Request template (to reflect Git for Windows)
Dec 22, 2017
8ac7fc0
Merge branch 'long-paths'
dscho Nov 15, 2018
d90fce5
SECURITY.md: document Git for Windows' policies
dscho Aug 23, 2019
4a54922
Merge branch 'msys2'
dscho Nov 15, 2018
56c6dc5
Merge branch 'kblees/kb/symlinks'
dscho Nov 15, 2018
379b05a
Merge 'docker-volumes-are-no-symlinks'
dscho Oct 12, 2018
30c5c09
mingw: try resetting the read-only bit if rename fails (#4527)
dscho Aug 7, 2023
de86df6
Merge pull request #1897 from piscisaureus/symlink-attr
dscho Oct 31, 2018
cd5fdf7
Merge branch 'busybox-w32'
dscho Feb 7, 2019
1da0c5c
Merge branch 'wsl-file-mode-bits'
dscho Aug 7, 2023
4fe776a
Merge pull request #1170 from dscho/mingw-kill-process
dscho Oct 11, 2018
0362bfa
Merge pull request #3492 from dscho/ns/batched-fsync
vdye Oct 28, 2021
a6454b9
Merge branch 'un-revert-editor-save-and-reset'
dscho Jan 15, 2022
1ad5ed7
Merge branch 'phase-out-reset-stdin'
dscho Jun 8, 2018
085b7c3
Merge branch 'deprecate-core.useBuiltinFSMonitor'
dscho Jan 24, 2023
43b92d0
Merge pull request #2837 from dscho/monitor-component-updates
dscho Oct 7, 2020
a8b90de
build(deps): bump actions/download-artifact from 4 to 5
dependabot[bot] Aug 12, 2025
f412dd9
Merge 'readme' into HEAD
dscho Jun 7, 2018
cb64cb9
build(deps): bump actions/checkout from 4 to 5
dependabot[bot] Aug 12, 2025
b3d5100
build(deps): bump actions/download-artifact from 4 to 5
dependabot[bot] Aug 12, 2025
10b0df0
Merge branch 'upgrade-two-actions-to-v5'
dscho Aug 12, 2025
ce7c02e
build(deps): bump actions/download-artifact from 4 to 5 (#5771)
rimrul Aug 12, 2025
9c2cfaa
build(deps): bump actions/checkout from 4 to 5 (#5772)
dscho Aug 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

DEF_VER=v2.51.0-rc1
DEF_VER=v2.51.0-rc2

LF='
'
Expand Down
2 changes: 1 addition & 1 deletion builtin/for-each-ref.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ int cmd_for_each_ref(int argc,
OPT_GROUP(""),
OPT_INTEGER( 0 , "count", &format.array_opts.max_count, N_("show only <n> matched refs")),
OPT_STRING( 0 , "format", &format.format, N_("format"), N_("format to use for the output")),
OPT_STRING( 0 , "start-after", &filter.start_after, N_("start-after"), N_("start iteration after the provided marker")),
OPT_STRING( 0 , "start-after", &filter.start_after, N_("marker"), N_("start iteration after the provided marker")),
OPT__COLOR(&format.use_color, N_("respect format colors")),
OPT_REF_FILTER_EXCLUDE(&filter),
OPT_REF_SORT(&sorting_options),
Expand Down
2 changes: 1 addition & 1 deletion builtin/merge.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static struct option builtin_merge_options[] = {
OPT_BOOL(0, "stat", &show_diffstat,
N_("show a diffstat at the end of the merge")),
OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")),
OPT_CALLBACK_F(0, "compact-summary", &show_diffstat, N_("compact-summary"),
OPT_CALLBACK_F(0, "compact-summary", &show_diffstat, NULL,
N_("show a compact-summary at the end of the merge"),
PARSE_OPT_NOARG,
option_parse_compact_summary),
Expand Down
Loading