repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-merge-tree.txt: add a section on potentional usage mistakes
2022-06-22
Elijah Newren
gi
t
-m
e
rge
-
t
ree
.
t
xt: add a
section on pot
e
ntio
n
al usage
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
w
r
en
merge-
t
re
e
: add a --al
l
ow-unrelated-histori
e
s flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah Newren
merge
-
tree
:
a
l
low
`ls-fi
l
es -u` sty
l
e inf
o
to be NUL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
ah
N
e
wren
merge-ort:
o
p
tionally produce
m
achine-
r
eadable o
u
tput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-
o
rt: store more specific conf
l
ict
information
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
J
o
hannes
S
chind
e
lin
mer
g
e-ort: make `path_
m
essages` a strmap to a string_lis
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Joha
n
nes
S
c
hindelin
merg
e
-
ort: store
messages in a list, not in a
single
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah
N
ewre
n
merge-tree: provi
d
e easy acces
s
t
o `ls-
f
i
l
es -u` styl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Newren
m
er
g
e-tree: pr
o
v
i
d
e a
l
i
st of
which fi
l
e
s
have
c
onflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
merge
-
ort:
r
emove comma
n
d-li
n
e-c
e
ntric submodu
l
e message
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merg
e
-ort: pro
v
ide a me
r
ge
_
ge
t
_co
n
f
l
i
cted_files()
hel
p
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
a
h
Newre
n
merge-tree
:
suppo
r
t
i
ncluding merge messages i
n
o
u
tput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
i
jah N
e
w
ren
merge-ort: split
o
ut a separ
a
te disp
l
ay_update_m
e
ssages
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Newren
merge-tree: implement re
a
l merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
mer
g
e-tree:
a
dd option parsing and
i
ni
t
i
a
l
shell for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
a
h New
r
e
n
m
e
rge-tree: move
l
ogic
for existing me
r
ge i
n
to new
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
erge-tree: rename m
e
rg
e
_
trees() to trivial_merge_tr
e
es()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
Junio C Hamano
Git 2
.
37-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-22
J
u
nio C Hamano
M
erge branch
'tb/cruft-pa
c
ks
'
commit
|
commitdiff
|
tree
2022-06-21
Junio C Hamano
Me
r
g
e
br
a
nc
h
'
j
p/prompt-clear-before-up
s
tream-mark'
commit
|
commitdiff
|
tree
2022-06-21
René Scharfe
gc: simplify
-
-cruf
t
desc
r
iption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-20
Alexander Shopov
name-rev: pre
f
i
x a
n
notate-stdin with
'
--
'
in message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-18
Junio C
Ham
a
n
o
Git 2
.
3
7
-rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-18
Juni
o
C Hamano
Merge
br
a
nch 'cb
/
pa
t
h-owner-check-with-sudo-plus'
commit
|
commitdiff
|
tree
2022-06-17
Carlo Marcelo
A
r
enas
.
.
.
git-compa
t
-
ut
i
l
: al
l
o
w root to access
b
o
th S
U
DO_UID
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-17
Ji
a
ng X
i
n
i
1
8n
:
fix mi
s
matched
cam
e
lCase config varia
b
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-17
Junio C Hamano
A
n
other batch of fix
e
s before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-17
J
u
ni
o
C Hamano
Merge branch 'jk/b
u
g
-
fl-va
-
list-
f
ix'
commit
|
commitdiff
|
tree
2022-06-17
Jun
i
o C Hamano
M
e
rg
e
branch '
a
b/c
r
edentials-in-url-
m
ore'
commit
|
commitdiff
|
tree
2022-06-17
J
u
nio
C Hamano
Merge b
r
anch
'
js/ci-github-w
o
rkflow-
m
arkup'
commit
|
commitdiff
|
tree
2022-06-17
Junio C H
a
mano
Merge branch 'js/misc-fi
x
es'
commit
|
commitdiff
|
tree
2022-06-17
Junio C Hama
n
o
Mer
g
e
bran
c
h 'jc/cocci-cle
a
nup'
commit
|
commitdiff
|
tree
2022-06-17
Jun
i
o C Hamano
M
e
r
ge branc
h
'ds/more
-
test-coverage'
commit
|
commitdiff
|
tree
2022-06-17
Junio C Hamano
Mer
g
e branch 'jk/pe
r
f-lib-te
s
t-titles'
commit
|
commitdiff
|
tree
2022-06-16
Jeff King
bug_fl(): correct
l
y
initialize tr
a
ce2
va_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-16
Johann
e
s
Schindelin
relative_url(): fix incorrec
t
condition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-16
Joha
n
nes S
c
hindelin
pack-
m
times
:
a
v
o
id
c
l
osing a bogus file descriptor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-16
Johannes Sch
i
n
d
elin
read_ind
e
x
_
f
r
om(): avoi
d
memory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-16
Johannes Schinde
l
i
n
submodule--helper:
avoid memory leak when fetchi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-16
J
ohannes Schindelin
submodule-config:
a
void memory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-16
Johann
e
s Schindelin
f
smonitor: avoid me
m
or
y
leak in `fsm_settings_
_
get_in
c
o
mpati
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-16
D
errick St
o
lee
cache
-
tree: rem
o
v
e
cache_t
r
ee_find_path()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-16
Derrick Stolee
p
a
ck-writ
e
: dr
o
p al
w
ays-NULL param
e
te
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-16
Der
r
ick
S
tolee
t
5
329: te
s
t 'git gc --c
r
uft' wit
h
out
'
--prun
e
=no
w
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-16
Derrick St
o
lee
t
2107: tes
t
'gi
t
updat
e
-ind
e
x --verbose'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-16
J
eff Ki
n
g
perf-l
i
b: fix miss
i
ng test ti
t
les in out
p
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-16
Fang
y
i Zhou
builtin/rebase: remove a redundant spa
c
e
i
n l10n string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-15
Junio C Hamano
Fix
e
s and u
p
da
t
es post -rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-15
Juni
o
C H
a
m
a
no
Merge branch
'
fs
/
ssh-default-key-comman
d
-
d
oc'
commit
|
commitdiff
|
tree
2022-06-15
J
uni
o
C
Hamano
Merge branch 'po/rebase-preserve-merges'
commit
|
commitdiff
|
tree
2022-06-15
Juni
o
C Hamano
Merge branch '
j
c/reve
r
t-show-pa
r
ent-info'
commit
|
commitdiff
|
tree
2022-06-15
Ævar Arnfj
ö
r
ð Bjar
m
ason
tests: add LIBCURL prerequis
i
t
e to
test
s
ne
e
ding lib
c
url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-15
Fang
y
i Zhou
pu
s
h: f
i
x
cap
i
talisation o
f
th
e
o
p
tion name
autoSetu
p
Merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-15
Ævar
A
rnfjörð Bjarmas
o
n
transfer doc:
move fetc
h
.
cre
d
entialsIn
U
r
l
to "transfe
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-15
Æva
r
Arnfjörð Bj
a
r
m
a
son
fetch doc:
n
ote "pus
h
ur
l
" caveat
a
bou
t
"c
r
edentialsInUrl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-15
Ævar Arnfjörð Bjarmason
add -
i
tes
t
s
: mark "TODO" depen
d
ing on GIT_TEST
_
ADD_I_USE_
B
U
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-13
J
u
nio
C
Hamano
Git 2
.
3
7
-
r
c0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-13
Junio C Hamano
M
e
rge branch 'gc/d
o
c
u
ment-config-worktree-scope'
commit
|
commitdiff
|
tree
2022-06-13
Junio C Hamano
Merg
e
branch 'js/wait-or-whine
-
can-fail'
commit
|
commitdiff
|
tree
2022-06-13
Junio C Hamano
Merge branch
'
a
b/remot
e
-fre
e
-fix'
commit
|
commitdiff
|
tree
2022-06-13
Jun
i
o C Hamano
M
erge branch 'sn/fsmo
n
itor-missing-c
l
ock'
commit
|
commitdiff
|
tree
2022-06-13
Junio C Hamano
M
erge branch 'zh
/
read
-
cache
-
copy-name-entry
-
fix'
commit
|
commitdiff
|
tree
2022-06-13
Ju
n
io C H
a
mano
Merge br
a
nch '
t
b
/
s
how-ref-optim'
commit
|
commitdiff
|
tree
2022-06-13
Junio C H
a
mano
Merge
b
ranch 'ds/credentials-in
-
url'
commit
|
commitdiff
|
tree
2022-06-13
Ju
n
io C Hama
n
o
Merge b
r
an
c
h 'jt/un
p
arse-commit-upo
n
-graft
-
c
hange'
commit
|
commitdiff
|
tree
2022-06-13
J
unio C Hamano
Mer
g
e bran
c
h 'a
b
/
hooks-regression-fix'
commit
|
commitdiff
|
tree
2022-06-13
Junio C
Hamano
Merge branc
h
'tl/ls-tr
e
e-oid-only'
commit
|
commitdiff
|
tree
2022-06-13
J
u
nio C Hamano
Me
r
ge br
a
nc
h
'pb/range
-
diff-
w
ith-submodul
e
'
commit
|
commitdiff
|
tree
2022-06-13
Johannes Schinde
l
i
n
ci(gi
t
hub): al
s
o mark
u
p compi
l
e errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-13
J
o
hannes Schi
n
del
i
n
ci(gi
t
h
u
b): u
s
e grouping
also in the `win-build` job
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-10
J
u
nio C
H
ama
n
o
Ni
n
th
b
at
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-10
Junio C H
a
mano
Me
r
g
e b
r
anch 'ab/
b
ug-if-b
u
g'
commit
|
commitdiff
|
tree
2022-06-10
J
u
nio C Hamano
Me
r
ge branch 'jy/gitweb-xhtml5
'
commit
|
commitdiff
|
tree
2022-06-10
Junio C Ha
m
a
n
o
Merg
e
b
r
a
nch
'jh/b
u
i
l
ti
n
-fsmonitor-part3'
commit
|
commitdiff
|
tree
2022-06-10
Junio C Hama
n
o
Merge branch
'gc/zer
o
-length-bran
c
h
-
c
o
n
fig-fix'
commit
|
commitdiff
|
tree
2022-06-10
Ju
n
i
o C Hamano
M
e
rge branch '
a
b/env-array'
commit
|
commitdiff
|
tree
2022-06-10
Juni
o
C Ham
a
no
Merge branch 'cb/buggy-g
c
c-12-
w
orkaround'
commit
|
commitdiff
|
tree
2022-06-10
Joa
k
im P
e
tersen
git-
p
rompt: fix expansion of
b
r
a
nch col
o
ur codes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-08
Fabian
S
t
elze
r
gpg docs:
explain better use of ssh
.
defaultKeyComm
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-08
Johann
e
s S
c
hind
e
l
in
ci(gith
u
b): bring bac
k
the '
p
rint test failure
s
' step
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-08
Junio
C Hamano
S
ync with 'maint'
commit
|
commitdiff
|
tree
2022-06-08
Junio C Hamano
Pr
e
pa
r
e for 2
.
36
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-08
Juni
o
C Hamano
Mer
g
e branch
'jc/c
l
o
n
e
-remote-na
m
e
-lea
k
-fix' into m
a
int
commit
|
commitdiff
|
tree
2022-06-08
Junio C Ha
m
a
no
Me
r
ge bran
c
h 'd
s
/midx-n
o
rmalize-pathn
a
me-before-comp
a
rison
.
.
.
commit
|
commitdiff
|
tree
2022-06-08
Junio C Hamano
Me
r
ge
branch
'
ah/rebase-keep
-
base-fix' i
n
to maint
commit
|
commitdiff
|
tree
2022-06-08
Junio C
Ham
a
no
Merge bran
c
h 'pw/test-ma
l
loc
-
with-
s
anitize-address
.
.
.
commit
|
commitdiff
|
tree
2022-06-08
Junio C Ham
a
no
Merge branch 'rs/comm
i
t-
s
umma
r
y-wo-br
e
ak-rewrite'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2022-06-08
Junio
C H
a
m
ano
Merge branch 'mg/detect-
c
o
m
p
iler-in-c-locale' into
.
.
.
commit
|
commitdiff
|
tree
2022-06-08
Juni
o
C
Hamano
Merge b
r
anch
'
cb/
c
i-mak
e
-
p
4-op
t
ional' i
n
to maint
commit
|
commitdiff
|
tree
2022-06-08
Junio C Hama
n
o
M
e
rge branch 'ab
/
v
algrind
-
fixes' into maint
commit
|
commitdiff
|
tree
2022-06-08
Junio
C Hamano
Merge bra
n
ch
'
jc/
a
rchive-
a
dd-fil
e
-normalize-mode' into
.
.
.
commit
|
commitdiff
|
tree
2022-06-08
J
unio C H
a
mano
Mer
g
e branch 'jc/sh
o
w
-branch-
g
-current' i
n
to maint
commit
|
commitdiff
|
tree
2022-06-08
Junio
C
Hamano
Merge branch 'jc/up
d
ate-ozlab
s
-
u
rl' into maint
commit
|
commitdiff
|
tree
2022-06-08
Junio
C H
a
mano
Merg
e
bran
c
h 'jc/http-clear-finished-pointer' into
.
.
.
commit
|
commitdiff
|
tree
2022-06-08
Junio C Hama
n
o
Merge
b
ran
c
h
'
js/
c
i-gcc-12-fixes' int
o
maint
commit
|
commitdiff
|
tree
2022-06-08
Glen Choo
config: document an
d
test
the 'worktre
e
' scope
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-07
Junio C H
a
m
ano
c
o
cci:
r
etire is_null
_
s
ha1() rule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-07
Juni
o
C
H
amano
Eight
h
batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2022-06-07
Junio C Hamano
Merge branch 'jc/all-ne
g
ative-pathspec
'
commit
|
commitdiff
|
tree
2022-06-07
Junio
C
Ha
m
ano
Mer
g
e branch '
j
s/scalar-diagno
s
e'
commit
|
commitdiff
|
tree
next