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: only return whether a path has conflicts or not
2018-08-06
Thomas Gummerer
rerere: o
n
ly
r
eturn whether a path has conflicts or
not
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-06
T
homas Gummerer
rerere: fix crash
w
i
t
h files r
e
rere can
'
t
h
andle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-06
Th
o
mas Gummerer
r
erere: add
d
oc
u
m
e
ntation for conflict normalizatio
n
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummerer
re
r
ere: mark stri
n
gs f
o
r
t
ranslat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-16
Tho
m
as Gumm
e
r
er
rerere: wra
p
paths in output in sq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-16
T
h
omas Gummere
r
rerere: l
o
werca
s
e
error messag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-16
Thomas Gummerer
rerere: un
i
fy error messages when
read_cache fai
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C Hamano
Second
b
a
tch for 2
.
19
c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-28
J
unio
C
Ha
m
ano
Merge bra
n
ch 'sb/fix-fetching-moved-sub
m
odules'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio C H
a
mano
Merge branch 'tz/cred-netrc-cleanup'
commit
|
commitdiff
|
tree
2018-06-28
Junio C H
a
man
o
M
erge branch 'jc/cl
e
a
n-a
f
ter-sanity-t
e
sts'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merge
b
ranch 'n
d
/comp
l
etion-negation'
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C Hamano
Merge branch 'pw/
a
dd-p-recount'
commit
|
commitdiff
|
tree
2018-06-28
Junio C
H
am
a
no
Merge branch 'jk/fetch-all-
p
eeled-fix'
commit
|
commitdiff
|
tree
2018-06-28
J
u
n
i
o C Hamano
M
e
rge b
r
anch 'ms/send-pack-honor-conf
i
g'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio C Haman
o
Merge branch 'jh/partial-
c
lone'
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C Hamano
Merge branch 'sg/gpg-tests-fix'
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C Hamano
M
erg
e
branch 'as/safe
c
rlf-qu
i
et-fix
'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio C Hamano
Merge
branch 'ab/re
f
spec-init-fix'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Ham
a
no
Fir
s
t bat
c
h
for 2
.
19 cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-25
J
u
n
io C Ha
m
ano
M
e
rge branch
'sb/p
l
ug-misc-lea
k
s'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
Hama
n
o
Merge
b
ra
n
c
h
'c
c
/tests-without-assuming-ref-fil
e
s-backend'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io C Hama
n
o
Merge branch 'sg/update-ref-stdin-cleanu
p
'
commit
|
commitdiff
|
tree
2018-06-25
J
u
nio C Hamano
Mer
g
e
branch 'n
d
/reject-empty
-
shallo
w
-
r
eque
s
t'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C H
a
m
a
no
Merge branch 'ls/comple
t
e-remote-upda
t
e
-
names'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Me
r
ge branch 'ag/rebase-p'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
Haman
o
Merge branch 'n
d
/complete-c
o
nfig-vars'
commit
|
commitdiff
|
tree
2018-06-25
J
unio
C
Hama
n
o
Me
r
ge branch
'
s
b/obj
e
c
t-store-alloc'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C
Hamano
Merge br
a
nch '
j
k/show-index'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Me
r
ge branch 'en/
m
erge-recursive-tests'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge b
r
anch 'nd/diff-apply
-
ita'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Ham
a
no
M
e
r
g
e branch 'ds/commit-graph-lockfil
e
-fix'
commit
|
commitdiff
|
tree
2018-06-25
Jun
i
o
C
Hamano
M
e
r
g
e b
r
a
nch
'n
d
/
c
ommit-util-to-slab'
commit
|
commitdiff
|
tree
2018-06-25
Jun
i
o
C Hamano
Merge br
a
n
c
h 'p
c
/submodul
e
-
h
elpe
r
-
f
ore
a
ch'
commit
|
commitdiff
|
tree
2018-06-25
J
unio C H
a
mano
Pr
e
p
are to st
a
rt 2
.
19 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-25
Stefan Be
l
ler
sequen
c
er
.
c
:
plu
g
mem
l
e
a
k
i
n git_sequencer_con
f
ig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-21
J
unio
C
H
amano
Git 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Junio
C Ham
a
no
Merge branch 'en/r
e
name-directory
-
de
t
e
ction-reboo
t
'
commit
|
commitdiff
|
tree
2018-06-19
Junio C Ham
a
no
Merge
t
ag 'l1
0
n-
2
.
18
.
0-r
n
d3
.
1' of git://g
i
thub
.
com
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
J
u
n
i
o
C Haman
o
M
erge branch '
c
f
/
s
ubmodule-p
r
o
g
r
ess-
d
issociate'
commit
|
commitdiff
|
tree
2018-06-19
J
unio C H
a
man
o
Merge branch
'
j
s/rebas
e
-i-root
-
fix'
commit
|
commitdiff
|
tree
2018-06-19
Stefan Beller
t7400: en
c
apsulate setup
code
in test_e
x
pect_success
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
T
o
dd
Z
ullinger
t340
4
: ch
e
ck
r
o
o
t com
m
i
t in 'reb
a
s
e
-
i
--root rewo
r
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
K
a
r
t
h
ikeya
n
Si
n
garave
l
a
n
d
o
c
:
fix
t
y
pos in documentation and release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd
Z
u
l
lin
g
er
g
i
t-
c
r
e
d
ential-netrc: make "all" defau
l
t target
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Junio C Haman
o
Alm
o
st 2
.
18
final
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C Hamano
Merg
e
b
ranch 'es/make-no-iconv'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Hamano
Mer
g
e b
r
anch
'sg/
t
7
4
06-chain
-
fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
Hamano
Merge bra
n
ch 'ks/branch-
s
et-upstream'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C Hama
n
o
Merge branch
'js/
r
eb
a
se-
i
-
r
oot-fix'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io C Ham
a
n
o
Me
r
ge branch
'
jk/ewah-bounds-check'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio
C
H
amano
Merge
tag 'l10n
-
2
.
18
.
0-rnd3
'
of git://git
h
ub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hama
n
o
A bunch of micro-
f
ixes before
going 2
.
18 fina
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge br
a
nch 'sb/b
l
ame-color'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Hama
n
o
Merg
e
branch 'm
w
/doc-merge-enumfix
'
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
mano
Merge branch 'en/rename-director
y
-
detec
t
ion'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C Hamano
Merge b
r
anc
h
'rd/doc-remote
-
tracki
n
g-with
-
hyphen'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C
H
amano
Me
r
g
e br
a
nch 'jl/
z
l
i
b
-
re
s
t
o
r
e-nu
l
-terminatio
n
'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C Hama
n
o
Merge branch 'ab/cred-netrc-no
-
autodie'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C Hama
n
o
Merge
branch 'km/
d
oc-work
f
l
ow
s
-
typofix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Haman
o
Me
r
ge
b
ranch '
l
d/git-p4-upd
a
tes'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io
C Hama
n
o
Merge
b
ranch
'rd/dif
f
-options-typofix'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Hamano
M
erg
e
branch 'rd
/
comm
e
nt-ty
p
ofix-in-sha1-file
'
commit
|
commitdiff
|
tree
2018-06-18
René Scharfe
merge-recursive:
u
se xst
r
dup() i
n
ste
a
d of fixed b
u
ffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZEDER Gábo
r
RelNote
s
2
.
18: minor
fix to entry about dynamically
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZEDER Gá
b
or
t7
4
06-sub
m
od
u
le-
u
pd
a
t
e
:
f
ix
bro
k
en &&-chain
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
J
o
hannes
S
c
hindelin
reb
a
se --root
:
f
i
x amending root
c
ommit
m
essages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd
Zullinger
reba
s
e --r
o
ot: demonstrate a bug while amen
d
ing root
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
J
e
ff
K
ing
e
wah: adjus
t
callers of ewah_read_mma
p
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jeff
K
ing
ewah_rea
d
_mmap: boun
d
s
-check mmap reads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Kaartic Sivaraam
t3200:
clarif
y
descr
i
pti
o
n of --set-upstream test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Luis Mar
s
ano
git-credential-netr
c
: f
i
x
e
xit st
a
tus w
h
en tests fa
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
L
u
i
s
M
arsano
git-c
r
edential-netrc: u
s
e in-tree Git
.
pm for
t
est
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd
Z
ullinger
git-credential-netr
c
: minor whitesp
a
ce cleanup in t
e
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
Eric Su
n
shine
Makefile: make NO_
I
CO
N
V really mean "no iconv"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
J
un
i
o C Haman
o
tests: c
l
ean after SANITY t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Stefan Beller
t5526: t
e
st
r
e
c
u
r
sive submodules when fe
t
chin
g
moved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Stefan Bell
e
r
submodule: fix NU
L
L
correctn
e
ss in
r
ena
m
ed broken
s
ubmodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Meng-Sung
W
u
doc: u
p
da
t
e t
h
e o
r
der of the sy
n
t
ax `git merg
e
--continue`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
R
ené Scharfe
b
l
ame
:
rel
e
ase string_list after use in parse_color_fields()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
René
S
ch
a
rfe
merge-re
c
u
rsiv
e
:
u
se xstrd
u
p() inste
a
d
o
f fixed buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
Git 2
.
18-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Junio C
H
amano
Merge branch 'j
k
/ind
e
x-pack-maint'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
Merge branch 'sg/compl
e
tion-zsh-workaround'
commit
|
commitdiff
|
tree
2018-06-13
J
u
n
io C Hamano
Merge
bra
n
ch 'sb/submodule-merge-in-mer
g
e
-recursive'
commit
|
commitdiff
|
tree
2018-06-13
Junio C
H
amano
Merg
e
branch 'jk
/
submodule-fsck-lo
o
se-fixup'
commit
|
commitdiff
|
tree
2018-06-13
Kiri
l
l Smelkov
fet
c
h-pa
c
k: test explicitly
t
hat --all
can fe
t
ch tag
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Je
r
emy Linto
n
packfile
:
corre
c
t zli
b
bu
f
fer handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Ne
w
ren
RelN
o
t
e
s 2
.
18: clarify where directory rename
detection
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Robe
r
t
P
.
J
.
Da
y
Use
hyphenated "remote-tracking
br
a
n
ch"
(docs
a
nd commen
t
s)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Ævar Ar
n
fjörð Bjar
m
ason
git-
c
redential-net
r
c:
r
e
mo
v
e use of
"autodie"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
L
u
k
e
Diamand
git-
p
4: au
t
o
-
size the block
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Di
a
ma
n
d
git-p4: narro
w
the scop
e
of
ex
c
eptio
n
s caught when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
gi
t
-
p4: ra
i
se exceptio
n
s f
r
om p4CmdList based on error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke
Diamand
git-p4: bet
t
e
r
err
o
r
rep
o
rting when p4 fail
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
L
uke Diamand
g
it-p4: add
optio
n
to disable syncing
o
f p4/m
a
ster
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Dia
m
and
git-p4: di
s
abl
e
-
r
eb
a
se: allow set
t
i
ng t
h
is via configura
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
R
omain Merland
g
it-p4: a
d
d o
p
tions --
c
ommit an
d
--disa
b
le-reb
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Masaya Suzuki
b
uiltin/send-pack:
p
opulate the de
f
ault
c
onfigs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Jonath
a
n
Tan
list-
o
bjects
:
check i
f
filter is NULL before usin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next