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 note about files with existing conflict markers
2018-08-29
Thomas
G
u
m
m
ere
r
rer
e
r
e
: add no
t
e
a
b
out
f
i
les with e
x
isting confl
i
ct
.
.
.
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-29
T
homas Gummerer
rerere:
m
ention caveat about un
m
atched conflict
markers
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gumme
r
e
r
rerere: recalculate
c
onflict ID when un
r
e
solved
c
onflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thoma
s
Gumm
e
r
e
r
rerere: teach
r
ere
r
e to
h
andle nested conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gumm
e
rer
rerere: ret
u
rn strbuf from handle
path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thoma
s
G
u
mmerer
rerere:
fac
t
or out handle_
c
onflic
t
fun
c
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Th
o
mas Gummer
e
r
rerere: only
r
eturn
whether a p
a
th has conf
l
icts or n
o
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
T
homas Gummerer
rer
e
r
e
: fix c
r
ash wit
h
files rerere
c
a
n
't
handle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas G
u
mmerer
re
r
ere:
add
documentation f
o
r conflict normalizati
o
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
G
u
m
mer
e
r
rerere: mark st
r
i
ngs for tr
a
nsla
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-07-16
Thomas Gumme
r
er
rerere: wrap paths in
output in sq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-07-16
T
h
o
mas Gu
m
m
ere
r
rerer
e
: lowercas
e
er
r
or messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-07-16
Thomas
Gummerer
rere
r
e:
u
ni
f
y
e
r
r
or me
s
sages when read_ca
c
he
f
ails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C
Hamano
Seco
n
d batch for 2
.
19 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-28
Jun
i
o C H
a
mano
M
erge branch 'sb/
f
ix-fetching-moved-submodu
l
e
s'
commit
|
commitdiff
|
tree
2018-06-28
Junio
C Hamano
Merge branc
h
'tz/cred-netrc-cleanup'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio C Haman
o
Merge branch 'jc/cle
a
n
-after
-
s
an
i
ty-
t
ests'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merg
e
branch
'
n
d
/c
o
mplet
i
on-negatio
n
'
commit
|
commitdiff
|
tree
2018-06-28
J
unio C Hamano
M
e
rge bran
c
h 'pw/ad
d
-
p-recount'
commit
|
commitdiff
|
tree
2018-06-28
Ju
n
io C Hamano
Merge
b
r
a
nch 'jk/
f
etch-all-peeled-fix
'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hama
n
o
Merge br
a
nch 'ms/send-
p
ack-honor-config'
commit
|
commitdiff
|
tree
2018-06-28
J
u
n
io C Hamano
Merge br
a
n
c
h
'jh/partial-clone'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merge branch 'sg/gpg-tests-fix'
commit
|
commitdiff
|
tree
2018-06-28
Junio C
Haman
o
Mer
g
e b
r
anch 'as/safecrlf-quiet-fi
x
'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio C Ham
a
no
Merge bra
n
ch 'ab/refspe
c
-init-fix'
commit
|
commitdiff
|
tree
2018-06-25
Jun
i
o C
H
a
mano
Fir
s
t batch for 2
.
19
cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C Hamano
Merge br
a
nc
h
'sb
/
pl
u
g-misc-l
e
a
ks'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
i
o
C
H
amano
Merge b
r
anch 'cc/tests-without-assu
m
i
ng-re
f
-file
s
-backen
d
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge bra
n
ch
'sg/update-ref
-
stdin-clea
n
up'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C
Ham
a
no
M
e
rge bran
c
h 'nd/re
j
ec
t
-emp
t
y
-shallow-reques
t
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
amano
Merge
b
ra
n
c
h
'ls/complete-remote-updat
e
-
n
a
m
e
s
'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C
H
amano
Me
r
ge br
a
n
c
h '
a
g/rebase-p'
commit
|
commitdiff
|
tree
2018-06-25
J
unio
C
H
a
m
a
no
Mer
g
e branch 'nd/com
p
lete-config-vars'
commit
|
commitdiff
|
tree
2018-06-25
J
unio C Hamano
Merge branc
h
'sb/object
-
stor
e
-
alloc'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C Hamano
Mer
g
e
branch 'jk/show-
i
ndex
'
commit
|
commitdiff
|
tree
2018-06-25
J
unio C Ham
a
no
Me
r
ge branch 'en/mer
g
e
-recursive-tests
'
commit
|
commitdiff
|
tree
2018-06-25
J
unio
C
H
a
mano
Mer
g
e branch 'nd/diff-apply-ita'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io
C Hamano
Mer
g
e branch 'ds/co
m
mi
t
-graph-lo
c
k
f
ile-fix'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge branch 'nd
/
commit-util-to-slab'
commit
|
commitdiff
|
tree
2018-06-25
J
unio C Ham
a
no
Merge branch 'pc/submodule-helper-f
o
reach'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C
Ham
a
no
Prepare to
s
tart
2
.
19 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-25
Stefan Bell
e
r
sequ
e
n
cer
.
c
:
plug
m
e
m leak in git_sequencer_co
n
fig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-21
J
uni
o
C Hamano
Git 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
J
unio C
H
amano
Merge b
r
anc
h
'en/rename-dire
c
tory-detect
i
on-reboot'
commit
|
commitdiff
|
tree
2018-06-19
Junio C Hamano
Merg
e
tag 'l10n-2
.
18
.
0
-
rnd3
.
1'
of g
i
t://gith
u
b
.
com
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
Ju
n
io C Hamano
Merge branc
h
'cf/submodule-progress-d
i
ssoc
i
ate'
commit
|
commitdiff
|
tree
2018-06-19
Jun
i
o C Ham
a
no
Merge branch 'js/re
b
ase-i-root
-
f
ix'
commit
|
commitdiff
|
tree
2018-06-19
Stefan Beller
t7400: encapsula
t
e setup code in test
_
e
xpect_succes
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
Todd Zullinger
t
3404:
c
h
e
ck root
c
o
m
mit in 'reba
s
e -i --root reword
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
K
arthik
e
yan Singara
v
e
l
an
doc: fix
typos in documenta
t
ion an
d
r
elease notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Todd Z
u
llinge
r
git-cred
e
ntial-
n
e
t
rc
:
m
ake "al
l
" defau
l
t targ
e
t
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Junio
C Hamano
Almost
2
.
18 fina
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Junio C
Hamano
Merge branch 'es/make-no-iconv'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Hamano
Mer
g
e branch 'sg/t7406-
c
hain-fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Mer
g
e bra
n
ch 'ks/
b
ranch
-
set
-
upstream
'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge br
a
nch 'js/rebase
-
i
-
root-fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch
'
jk/ewah-
b
ounds-check'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
M
e
rg
e
tag '
l
10n-2
.
18
.
0-rnd3' of git:
/
/githu
b
.
com
/
gi
t
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
A bu
n
ch of micro-
f
ixes
b
efore goin
g
2
.
18 fi
n
al
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Junio C
Hamano
Merg
e
branch 'sb/blame-color'
commit
|
commitdiff
|
tree
2018-06-18
Junio C
H
a
m
an
o
M
e
rge branch
'
m
w/doc-merge-enumfix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch 'en/
r
ena
m
e-directo
r
y-detect
i
on
'
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C Ha
m
ano
Me
r
ge branch
'rd/doc-remote-tracking-with-h
y
phen'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io C Ham
a
no
Merge branch 'jl/zlib-restore-n
u
l-te
r
m
ination'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge
bran
c
h 'ab/cr
e
d-netrc-no
-
autod
i
e'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C Hama
n
o
Merge br
a
nch 'km
/
doc-work
f
lows-typofix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
M
erge branch 'ld/git-p4-u
p
dates'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
M
e
rge branch 'rd/diff-options-
t
ypofix'
commit
|
commitdiff
|
tree
2018-06-18
J
unio
C Hamano
Merg
e
branch 'rd/comment-
t
ypof
i
x-i
n
-sha1-fil
e
'
commit
|
commitdiff
|
tree
2018-06-18
René Scharfe
merge-recu
r
sive: use
x
s
t
rdup(
)
instead of f
i
xed buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
SZEDER
Gábor
RelNo
t
es 2
.
18: m
i
no
r
fix to entr
y
about dynamically
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
SZEDER Gábor
t7406-submodule
-
update
:
f
i
x broken &&-chains
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Johannes Sch
i
ndeli
n
rebase --root: fix am
e
ndi
n
g
r
oo
t
commit messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
T
o
d
d
Zul
l
in
g
er
re
b
a
s
e
--root
:
d
emonstr
a
t
e a bug
w
hile amend
i
ng root
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
J
ef
f
K
i
ng
ewah: adjust callers of ewah_
r
ea
d
_mmap()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Jeff King
ew
a
h_
r
ead_
m
map:
bounds-check m
m
ap reads
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Kaartic S
i
var
a
am
t
3
200: cla
r
ify descripti
o
n
o
f --set-upstream test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Lu
i
s Mar
s
ano
git-cre
d
ential-netrc
:
fix exit
status when tests fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Luis Mars
a
no
git-credential-netrc: use
in-tree
G
it
.
pm for te
s
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zullinger
git-credentia
l
-netrc:
m
inor whitespace cleanup
in test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-15
Eric Su
n
shine
M
akefile:
mak
e
N
O_ICONV
really me
a
n "no ico
n
v"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-15
Junio C Hamano
tests
:
clean after
SANITY
t
e
st
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
Stefan Beller
t5526:
t
est recurs
i
ve
s
ubmod
u
les when f
e
tching mo
v
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
Stefan B
e
ller
s
u
bm
o
dule
:
fix
N
U
LL correctness i
n
r
e
nam
e
d broke
n
su
b
modules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
M
e
n
g
-Sung Wu
doc: update t
h
e order of th
e
s
yn
t
ax
`
git merge --c
o
ntinu
e
`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
René Schar
f
e
bl
a
me: rele
a
se string_
l
is
t
a
f
ter use in parse_
c
ol
o
r_fields
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
René Sc
h
arfe
merge-recursive: use xstrdup() inst
e
ad of
f
i
xed
buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Juni
o
C
Hama
n
o
Git 2
.
1
8
-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Juni
o
C Ha
m
ano
Mer
g
e branch 'jk/index-pack-m
a
int'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
Merge branc
h
'sg/completion-zsh-wo
r
karound'
commit
|
commitdiff
|
tree
2018-06-13
J
unio
C
Hamano
Merge bran
c
h
'
s
b/submodule-merge-in
-
merg
e
-rec
u
rsive'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
Merge branch 'jk/s
u
bmodule-fsck-l
o
ose-fixu
p
'
commit
|
commitdiff
|
tree
2018-06-13
Kirill Smelkov
fetch-pack: test expl
i
citly
t
h
at --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
J
eremy L
i
n
ton
packfile: corr
e
ct zlib
b
uffer
h
andling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newren
RelNotes 2
.
18
:
cla
r
ify where dire
c
t
o
ry
rename
d
e
t
e
ctio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Rober
t
P
.
J
.
Day
Use hy
p
henat
e
d "remote-t
r
acking
b
ranch" (docs and c
o
mments)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Æ
var Arnf
j
ö
rð Bjarmason
g
it-credential-netrc: remove use o
f
"a
u
t
o
d
ie"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke D
i
a
mand
git-p
4
:
auto-size the b
l
o
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke
D
iamand
git-p
4
: narrow
t
he
s
cope of exceptions caught wh
e
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
L
u
ke Dia
m
and
git
-
p4: raise e
x
c
e
ptions
f
rom p4
C
mdList based on error
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next