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
am -3: do not let failed merge from completing the error codepath
2015-08-28
J
u
nio C Hamano
Seve
n
th ba
t
ch for
2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-28
Junio C Haman
o
Merg
e
bran
c
h
'
cc/
t
railers-corner-case-fix
'
commit
|
commitdiff
|
tree
2015-08-28
J
unio C
Hamano
Merge branch 'dt/untracked-subdir'
commit
|
commitdiff
|
tree
2015-08-28
Junio C Haman
o
Git 2
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-26
J
unio
C
Ha
m
ano
Sixth batch
f
o
r
2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-26
Junio C Hamano
Merge bran
c
h 'sg/help-gr
o
up'
commit
|
commitdiff
|
tree
2015-08-26
Juni
o
C H
a
mano
M
e
r
ge branch 'sg/wt-status-hea
d
er-in
c
lus
i
on'
commit
|
commitdiff
|
tree
2015-08-26
Juni
o
C
Hamano
M
erge b
r
a
nch
'
as/
d
o
c
f
i
x-reflog-exp
i
re-unreachable'
commit
|
commitdiff
|
tree
2015-08-26
J
u
nio C Ham
a
no
Merge branch 'sg/t3
0
2
0
-
t
ypofix'
commit
|
commitdiff
|
tree
2015-08-26
J
u
ni
o
C Hamano
Merg
e
branc
h
'jc/calloc-pat
h
spec'
commit
|
commitdiff
|
tree
2015-08-26
Junio
C
Hama
n
o
M
e
rge branch
'dt/untrack
e
d-s
p
arse'
commit
|
commitdiff
|
tree
2015-08-26
Jun
i
o C Hamano
M
e
rge bran
c
h
'pt
/
am-builtin'
commit
|
commitdiff
|
tree
2015-08-26
Junio C
H
amano
Merge branch 'pt/am
-
builtin-
a
bort-fix'
commit
|
commitdiff
|
tree
2015-08-26
J
u
nio C
H
a
mano
Merge branch 'po/
p
o-r
e
adme'
commit
|
commitdiff
|
tree
2015-08-26
Junio C Ham
a
no
Merge branch 'jv/send-email-s
e
lective-smtp-aut
h
'
commit
|
commitdiff
|
tree
2015-08-26
Junio C Hamano
M
e
rge branch 'ep/
h
ttp
-
configure-ssl-
v
ersion'
commit
|
commitdiff
|
tree
2015-08-26
Junio C Hamano
Merge branch 'ss/fix-
c
onfig-fd-leak'
commit
|
commitdiff
|
tree
2015-08-25
J
u
n
i
o C Ham
a
no
Sync w
i
th main
t
commit
|
commitdiff
|
tree
2015-08-25
Junio
C Hama
n
o
Merge br
a
nch 'jk/guess-repo-name-regression-fix' into
.
.
.
commit
|
commitdiff
|
tree
2015-08-25
Ju
n
io C H
a
mano
Mer
g
e branc
h
'jk/test-with-
x
' into maint
commit
|
commitdiff
|
tree
2015-08-25
Junio C
H
amano
M
e
rge branch
'
s
b
/check-r
e
tu
r
n-from-read-ref
'
into m
a
int
commit
|
commitdiff
|
tree
2015-08-25
Junio C
H
amano
Merge branch 'mm/pul
l
-upload-p
a
ck
'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
pull:
p
ass upload_
p
ack o
n
ly whe
n
i
t was given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
Fi
f
t
h
b
a
tch for 2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-25
Junio C
Hamano
Merge branch 'cb/open-noatime-clea
r
-errno'
commit
|
commitdiff
|
tree
2015-08-25
Ju
n
io C Hamano
Merge
b
ra
n
ch 'mh/tempf
i
l
e
'
commit
|
commitdiff
|
tree
2015-08-25
Junio
C
Hama
n
o
Merge br
a
nch 'pt/
a
m-bui
l
tin-options
'
commit
|
commitdiff
|
tree
2015-08-25
Junio C Ha
m
ano
Merge branch 'dt/r
e
fs-pseudo'
commit
|
commitdiff
|
tree
2015-08-25
Junio C Ha
m
ano
Merge
b
r
a
nch 'dt/note
s
-multiple'
commit
|
commitdiff
|
tree
2015-08-25
Ju
n
i
o
C Hamano
Merge branch 'nd/d
w
im-wi
l
dcards-a
s
-pa
t
hspecs'
commit
|
commitdiff
|
tree
2015-08-25
Jun
i
o
C Ha
m
ano
Merge
bra
n
ch 'jk/long
-
error-messages'
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
M
erge branch 'ee/clean-remove-dirs'
commit
|
commitdiff
|
tree
2015-08-25
Junio C
Hamano
M
e
rge branch
'
j
h
/st
r
buf-read-use-re
a
d-
i
n-full'
commit
|
commitdiff
|
tree
2015-08-25
J
u
nio C H
a
mano
builtin/log
.
c: mi
n
or reformat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-25
Junio
C
Hamano
write_file(): drop calle
r
-
supplied LF from
c
alls to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-25
Junio C Hamano
wr
i
te_file_v():
do not l
e
a
v
e
incomplete line
a
t the end
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-24
Junio
C
Hamano
write_file
(
): drop "fatal" parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-24
Junio C Hamano
b
u
iltin/am
:
make sur
e
state files
a
r
e
te
x
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-24
Junio C Hamano
builtin/am:
in
t
roduce
w
r
ite_st
a
te_*() help
e
r
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
J
un
i
o C Hamano
log: show
m
e
rg
e
c
o
m
mit when
-
-cc is given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
J
unio C Hamano
log: whe
n
--cc
i
s giv
e
n
, default t
o
-p unless told
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
Junio C Hama
n
o
l
o
g: rename "tweak" helpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-20
Junio C Hamano
ps_matche
d
:
x
calloc() tak
e
s nmemb and
then e
l
e
m
ent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
J
u
nio C Ha
m
an
o
S
y
nc with m
a
i
nt
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
F
o
urth b
a
tch
f
or
2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge
bra
n
ch
'
tb/comp
l
ete-rebas
e
-i-ed
i
t-todo'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
M
erge branch
'
jk/git-path'
commit
|
commitdiff
|
tree
2015-08-19
J
u
n
io C Hamano
Merge branch 'jc/fi
n
alize-
t
emp-file'
commit
|
commitdiff
|
tree
2015-08-19
Jun
i
o C
H
aman
o
M
e
rge branch '
p
s/guess-repo-name-at-root'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Me
r
ge branch 'j
k
/guess-repo-name-
r
egres
s
ion-
f
i
x
'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge branch 'jk/ne
g
ative-hiderefs'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Haman
o
Merge branch 'jk/test-
w
it
h
-x'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Ham
a
no
M
e
rge
b
ranc
h
'ps/t15
0
9-chroot-te
s
t-fixu
p
'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Ha
m
ano
M
e
rg
e
bran
c
h 'sb/che
c
k-
r
eturn-from-read-
r
ef'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge branc
h
'mm/
p
ull-upload-pa
c
k'
commit
|
commitdiff
|
tree
2015-08-19
Junio C H
a
mano
Start p
r
eparin
g
for 2
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Junio C
Hamano
Mer
g
e
branch 'ta/docf
i
x-ind
e
x-
f
ormat-tech
'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Me
r
g
e branch 's
b
/parse-options-codeformat
'
into
m
aint
commit
|
commitdiff
|
tree
2015-08-19
Junio
C
Hamano
Me
r
ge
branch 'sb/re
m
ove-unused-var-from-buil
t
i
n
-ad
d
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Me
r
ge
b
ranch 'kn/ta
g
-doc-fix' into maint
commit
|
commitdiff
|
tree
2015-08-19
Junio C Haman
o
M
e
rge
branch
'es/doc-clean-outdated
-
tool
s
' into maint
commit
|
commitdiff
|
tree
2015-08-19
J
u
nio C
H
amano
Merge branch
'
nd/
e
x
p
ort-
w
orktree' into maint
commit
|
commitdiff
|
tree
2015-08-19
Junio
C Hamano
Merge
b
r
anch 'mh/fast
-
im
p
or
t
-optimi
z
e-current-fro
m
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge branch 'i
b
/scr
i
pted-parse-opt-better-
h
i
nt-string
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
J
unio C Hamano
M
e
rge branch 'se/doc-checkout-ours-theirs' into mai
n
t
commit
|
commitdiff
|
tree
2015-08-19
J
u
nio C Hamano
M
e
r
ge b
r
anch 'cb/uname-in
-
untracked'
into maint
commit
|
commitdiff
|
tree
2015-08-19
Junio C Ham
a
no
M
e
rge br
a
nch 'a
s
/
s
parse-checko
u
t-removal' into main
t
commit
|
commitdiff
|
tree
2015-08-19
Junio
C Hamano
M
e
r
ge
bra
n
ch 'db/send-pack-user-sign
i
ngkey' into maint
commit
|
commitdiff
|
tree
2015-08-19
Ju
n
io
C
Hama
n
o
Merge bra
n
c
h
'jx/do-not-crash-receive-pack-wo
-
head
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
Ju
n
i
o C H
a
ma
n
o
Merge
branch 'da/su
b
tree-date-confusion' into
maint
commit
|
commitdiff
|
tree
2015-08-17
J
unio
C
Hamano
T
h
i
rd batch
for 2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-17
J
u
n
i
o C Ham
a
no
Merge
b
ran
c
h 'dt/un
t
r
a
c
k
e
d
-sparse'
commit
|
commitdiff
|
tree
2015-08-17
Ju
n
io C
Hamano
Me
r
ge branch
'ta/docfix-index
-
format-tech'
commit
|
commitdiff
|
tree
2015-08-17
J
unio
C
Ha
m
ano
Mer
g
e bra
n
ch 'mh/ge
t
-re
m
ot
e
-
group-fix'
commit
|
commitdiff
|
tree
2015-08-17
Junio C Hamano
Me
r
ge branch 'kd/pull-reb
a
se-au
t
ostash'
commit
|
commitdiff
|
tree
2015-08-12
Junio C Hamano
S
e
c
ond batch for
2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-12
Junio C Hamano
Merge branch 'sb/
r
emove-unused-var-fr
o
m-builtin-add'
commit
|
commitdiff
|
tree
2015-08-12
Junio C Hamano
M
erge
branch 'sb/parse-options-c
o
defo
r
mat'
commit
|
commitdiff
|
tree
2015-08-12
Junio C Ha
m
ano
Merge branch 'dt
/
unpack-trees-cache-tree-rev
a
lidate'
commit
|
commitdiff
|
tree
2015-08-12
Junio
C
H
amano
Merg
e
branch 'dt/reflog-tes
t
s'
commit
|
commitdiff
|
tree
2015-08-12
Junio
C
H
am
a
no
Merge
branch '
e
s/wor
k
tree-add-c
l
eanup
'
commit
|
commitdiff
|
tree
2015-08-12
Juni
o
C Ha
m
ano
Merge
b
ran
c
h 'pt/a
m
-builtin'
commit
|
commitdiff
|
tree
2015-08-12
J
u
nio C Hamano
Merge
bran
c
h '
e
s/wo
r
ktree-
a
dd'
commit
|
commitdiff
|
tree
2015-08-12
Junio
C
Ha
m
ano
M
erge branch 'ad/bisect-cleanup'
commit
|
commitdiff
|
tree
2015-08-10
Jun
i
o
C
H
a
man
o
sh
a
1_fil
e
.
c: rena
m
e move_temp_t
o
_file() to finalize_object_f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
amano
First batch f
o
r
2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
amano
Merge bra
n
ch 'e
s
/doc-c
l
ean-out
d
ated-tools'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge
b
ra
n
ch 'jk/refspec-
p
ar
s
e
-wi
l
d
card
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
amano
Merge branc
h
'da/subtree-date-confusion'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
erg
e
b
ra
n
ch 'jx
/
do-not-
c
r
a
s
h
-receive-pack-wo-head'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
no
Me
r
g
e b
r
anc
h
'db/se
n
d-pack
-
user-signingkey'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C
H
a
mano
Merge branch
'
z
b/u
s
erdi
f
f-founta
i
n
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ha
m
a
no
Merge branch 'dt/refs-b
a
ckend-pream
b
l
e
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Hamano
Merge branch 'as/sparse-c
h
ecko
u
t
-
removal
'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hamano
Merge br
a
nch 'jk/da
t
e-mod
e
-
for
m
at'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ha
m
ano
Mer
g
e bra
n
ch 'p
t
/am-tests'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Hamano
Mer
g
e
branc
h
'sg/ba
s
h-prompt-untr
a
cked-optim'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hamano
Merge branch
'cb/uname-in-untracked'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge
b
ranch
'
s
e/doc-
c
hecko
u
t
-
ours-theirs'
commit
|
commitdiff
|
tree
next