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
rerere: add documentation for conflict normalization
2018-08-06
Thomas Gummerer
rerere: add documen
t
at
i
o
n
for
confli
c
t normaliza
t
ion
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas
G
u
mmerer
rerer
e
: mark strings for translation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-16
Thomas Gummerer
rerere:
wrap paths in outpu
t
in s
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-16
Thomas Gum
m
e
r
e
r
r
erere: lowerc
a
se
error
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-16
Th
o
mas Gummerer
rerere: u
n
ify erro
r
m
e
ssag
e
s
when
r
ea
d
_cache f
a
ils
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C Hamano
Second
ba
t
ch for
2
.
19 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-28
Junio C
H
amano
Merge branch 'sb/fix
-
fetchin
g
-moved-submodul
e
s'
commit
|
commitdiff
|
tree
2018-06-28
J
uni
o
C Hamano
Merge
b
ranch '
t
z/
c
red-ne
t
r
c-cleanup
'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio C Hamano
Merge
branch 'jc/c
l
ean-a
f
te
r
-sanity-tests'
commit
|
commitdiff
|
tree
2018-06-28
Junio C H
a
man
o
Me
r
ge br
a
nch 'nd/completion-negat
i
o
n
'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merge branch '
p
w/add-p
-
recount'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
M
erge b
r
a
n
c
h
'
jk/fetch-all-peeled-f
i
x'
commit
|
commitdiff
|
tree
2018-06-28
Junio C
Ha
m
an
o
Merge branch 'ms/send-p
a
ck-honor-config'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Me
r
ge branch
'jh/partial-clone'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Haman
o
M
erge branc
h
'sg/gpg-te
s
ts-fix'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio
C
H
amano
Merge branch '
a
s
/
s
a
fecrlf-quiet-f
i
x'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio C
Hamano
Merge branch
'
a
b/refspe
c
-
i
nit-fix'
commit
|
commitdiff
|
tree
2018-06-25
J
u
n
i
o C Hamano
Fir
s
t
b
a
tch
f
o
r
2
.
1
9 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-25
Junio
C
Haman
o
Merge branch
'
sb/plug-misc-leaks'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge branch
'
c
c
/
tests-wi
t
hout-assu
m
ing-ref-files-ba
c
kend'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C Haman
o
Mer
g
e branch 'sg
/
up
d
ate-ref-stdin-cleanup'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C Haman
o
Merge bran
c
h 'nd/reject-empty-s
h
allow-request'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
Hamano
Merg
e
branch 'ls/co
m
plete-remote-update-nam
e
s'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io C Hamano
Mer
g
e bran
c
h
'
ag/rebase-p'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C Hamano
Merge branc
h
'nd/
c
omplete-config-vars'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C Hamano
Me
r
ge bra
n
c
h 'sb/object-
s
tore-a
l
loc'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge branch 'jk
/
show-index
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge
b
ranch 'en/merge-recursive-t
e
sts'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Ham
a
n
o
Merge
b
ranch
'nd/diff-appl
y
-
ita'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
M
e
r
ge
b
ran
c
h 'ds/
c
ommit
-
g
r
aph-lockfile
-
fix'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io
C
Hamano
M
e
r
g
e branch 'nd/co
m
mit-util
-
to-slab'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
amano
Merg
e
branch 'pc/submodu
l
e-
h
elper-foreach'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Pre
p
a
re to start 2
.
19 cy
c
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-25
Stefan Beller
seq
u
encer
.
c: plug mem leak
i
n git_sequencer_conf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-21
Junio C
Hamano
G
i
t 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Junio C Haman
o
Me
r
g
e branc
h
'en/re
n
a
m
e-directory
-
detection
-
reboot'
commit
|
commitdiff
|
tree
2018-06-19
Junio
C
Hama
n
o
Mer
g
e tag 'l10n
-
2
.
18
.
0-rnd3
.
1
'
of git://gith
u
b
.
com
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
Jun
i
o C Hamano
Merge branch 'c
f
/
s
ubmodule-progress
-
dissoc
i
ate
'
commit
|
commitdiff
|
tree
2018-06-19
Junio
C Hamano
M
erge
b
ranch 'j
s
/re
b
ase-i-
r
oot-fix'
commit
|
commitdiff
|
tree
2018-06-19
Stefan Beller
t
7400: encapsulate setu
p
c
o
de in t
e
st_expec
t
_su
c
c
e
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Todd Zullinge
r
t
3
40
4
: c
h
eck root commit in 'rebase -i --r
o
ot reword
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Karth
i
key
a
n Singarave
l
a
n
d
oc: fix typos in document
a
ti
o
n and release no
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Tod
d
Zul
l
i
nger
git-crede
n
tial-netrc:
m
a
k
e "all" def
a
ult target of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C H
a
mano
Almos
t
2
.
18 fina
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
Ha
m
ano
M
e
rge branch 'es/make-no-i
c
onv'
commit
|
commitdiff
|
tree
2018-06-18
J
u
ni
o
C Hamano
Merge branch '
s
g/t7406-chain
-
fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C
H
amano
Merge
b
ranch 'ks/bran
c
h
-
set-upstream'
commit
|
commitdiff
|
tree
2018-06-18
Junio C
H
ama
n
o
Merge
branch 'js/rebase-i-root-fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
M
erge br
a
n
ch 'jk/ew
a
h-bou
n
ds-check'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o
C
Hama
n
o
Merge
t
a
g 'l10n-2
.
18
.
0-rnd3' o
f
git://github
.
com/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ham
a
no
A bunch of micro-fixes before going 2
.
18 final
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Junio
C Hamano
M
er
g
e branc
h
'sb/blame-color'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ham
a
no
Merge bran
c
h
'
mw/doc-merge-enumfix
'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C Hama
n
o
Merge b
r
anch
'en/rename-directory-detection'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io C Hamano
M
e
rge br
a
nch 'rd/doc-remote-trackin
g
-
w
ith-hyphen'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C
Ha
m
ano
Merge branch 'j
l
/zlib-restore-nul-termination'
commit
|
commitdiff
|
tree
2018-06-18
J
u
n
i
o C
H
amano
Me
r
g
e
b
r
a
n
c
h 'ab/cre
d
-n
e
trc
-
no-autodie'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Hamano
M
e
rge branch '
k
m/doc
-
wor
k
f
l
o
w
s-typofix
'
commit
|
commitdiff
|
tree
2018-06-18
J
uni
o
C Hamano
Merge bran
c
h
'ld/git-p
4
-updates'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Me
r
ge branch 'rd/diff-
o
pt
i
ons-t
y
pofix'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Hamano
Merge branc
h
'rd/co
m
me
n
t-typofix-in-sh
a
1-file'
commit
|
commitdiff
|
tree
2018-06-18
René Scharfe
merge-
r
ecur
s
ive: use
xstrdu
p
() inste
a
d o
f
f
ixed bu
f
fer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
S
ZE
D
ER Gábor
RelNo
t
es 2
.
18
:
m
inor fix t
o
e
n
try
about dynamically
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZE
D
ER Gáb
o
r
t
74
0
6-submodule-
u
p
d
ate: fix broken &&-chain
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Johann
e
s Schindelin
rebase --root: f
i
x amending root commi
t
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zullin
g
er
rebase --root: d
e
mons
t
r
a
te a bug while amendin
g
root
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jeff
Kin
g
ewah: adjust call
e
rs of ewah_read_mmap()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jeff King
e
w
ah_read_
m
map: bounds-check mm
a
p
reads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Kaartic Si
v
a
raam
t3
2
00:
clarif
y
description
of
-
-
set-upstream
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
L
u
is Marsano
gi
t
-credent
i
al-netr
c
: fix exit
sta
t
us
w
hen
t
ests
fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Luis Marsan
o
git-
c
redenti
a
l-netrc: use i
n
-tree Git
.
pm for
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zullinger
git-c
r
edential-netrc: minor whitespa
c
e cleanup in test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
Eric Sunshine
Makefile: make NO_
I
CONV really
mean "no ico
n
v"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
Junio C H
a
m
ano
test
s
: clean after SANITY
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
St
e
fan Beller
t5
5
26:
t
est recursive sub
m
o
d
u
l
es w
h
en fetching moved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
St
e
f
a
n
Beller
submodule: fix NULL correc
t
ness in renamed broken submodul
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Meng-
S
ung W
u
d
o
c: update the order of
t
h
e
s
y
n
tax `
g
it merge --conti
n
u
e`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
R
ené Scharfe
blame:
release str
i
ng_list a
f
ter
u
se in parse_
c
olor_fiel
d
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
René
S
charfe
merge-re
c
ursive:
u
se xstrdup
(
) i
n
stead o
f
fixed
buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
G
i
t 2
.
18-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Jun
i
o C
H
am
a
no
M
erge bran
c
h 'jk/index
-
p
ack-maint'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
Merge b
r
anch '
s
g
/completion-zsh-workaroun
d
'
commit
|
commitdiff
|
tree
2018-06-13
J
u
n
io
C
Hamano
Merge branch
'
sb/submodule-merge-
i
n-merge-
r
ecursive
'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
Mer
g
e bra
n
ch 'jk/submodule-fsck-loose-fi
x
up'
commit
|
commitdiff
|
tree
2018-06-13
Kirill Smelkov
fetch-pack
:
test
e
x
pli
c
itly that --all can fetch tag
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Jeremy Linton
p
a
c
kfile:
corr
e
ct z
l
ib bu
f
fer handli
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Elija
h
N
ewren
RelNotes 2
.
18:
c
larify where d
i
r
ec
t
or
y
rename d
e
tection
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
R
ober
t
P
.
J
.
D
a
y
Use hyphenated "remote-track
i
ng branch"
(
docs
a
nd com
m
e
nts
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Æ
v
ar
Arnfj
ö
rð Bjar
m
ason
git-credential-ne
t
r
c
: r
e
move use of
"a
u
todie"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Di
a
mand
git-p4: auto-size the bl
o
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke D
i
a
mand
git-p4: narrow the scope of e
x
ceptions cau
g
ht when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke
D
i
amand
g
i
t-p
4
:
r
aise exc
e
p
tions from p4CmdL
i
st based on error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
git-p4: better
e
rror reporting when p4 fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Lu
k
e Diamand
g
it-p4: add o
p
tion to
d
isa
b
le syncing of p4/ma
s
ter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
L
u
ke Diamand
gi
t
-p4:
d
isab
l
e-re
b
a
se: allow set
t
ing this via config
u
r
at
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
R
o
main Merland
git-p4: ad
d
options --commit and --disable-
r
ebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Masaya
S
u
zuk
i
b
u
i
l
t
in/send-pack: populate the default configs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Jonathan Tan
list-objects: che
c
k if filter is
N
ULL before
using
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Kyle Meyer
gi
t
wo
r
kflows: fix grammar in 'Mer
g
e upward
s
' rule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
SZE
D
ER Gábor
completion: correct zsh dete
c
tion w
h
en r
u
n from git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next