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
Merge branch 'ps/doc-packfile-vs-pack-file'
2015-05-06
Junio C H
a
m
ano
Merge branch 'mh/show-bra
n
ch
-
topic'
commit
|
commitdiff
|
tree
2015-05-06
J
unio
C
Haman
o
Merge br
a
nch '
s
b/line-log-
p
lug-pairdiff-l
e
a
k
'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o
C Hamano
Merge branch 'jc/diff-no-index-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merge branch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-05-05
Ju
n
io
C Ham
a
no
daemon: unbr
e
ak NO
_
IPV
6
build regre
s
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Jun
i
o C Hamano
write_sha1_file(): d
o
not use a sepa
r
ate sha
1
[] array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio C H
a
m
a
no
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io
C
H
a
m
a
no
m
erge: deprecat
e
'git merge <mes
s
age> HEAD <comm
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
Hamano
m
e
r
g
e: ha
n
dle FETCH
_
HEAD int
e
r
nally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Haman
o
merge:
d
ecide if we auto-
g
ener
a
te the messag
e
early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Ha
m
ano
merge: make collect
_
parents() auto-gener
a
te
the
merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io C Hamano
merge: extract
p
repare_merge_
m
essage() logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C
Hamano
merge: narrow scope o
f
merge_
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
split
red
u
c
e
_parents() out of
collect_pa
r
e
nts()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
un
i
o
C Hamano
merge: clarify co
l
lect_parent
s
() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io C Hamano
merge: s
m
all
l
e
a
kfix and c
o
de
simplifi
c
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Haman
o
m
e
r
g
e: do
not check arg
c
to det
e
rmine nu
m
ber of
r
emote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
ni
o
C Hamano
merge
:
c
lari
f
y "pul
l
ing into
void" special ca
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
t5
5
2
0
: test pulling an oct
o
p
u
s
i
n
t
o
an unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
t552
0
:
style fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
merge
:
simplif
y
code
flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
erge: tes
t
the
t
op-level merge d
r
i
ver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Hamano
test: va
l
idate
p
rerequistes syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
io C H
a
mano
M
e
r
ge
b
ranch
'
mh/multimail-r
e
newal'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
M
erge branch 'mg/show-notes
-
doc'
commit
|
commitdiff
|
tree
2015-04-28
J
u
ni
o
C
H
ama
n
o
Merge branc
h
'nd/versioncmp-prereleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge
b
ranch 'mg/
s
tatus-v-v'
commit
|
commitdiff
|
tree
2015-04-27
J
u
ni
o
C Ha
m
ano
Sync with 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio C Ham
a
no
Git 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge branc
h
'tb/co
n
nec
t
-
ipv6-
p
ar
s
e
-f
i
x' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Ha
m
a
n
o
Merg
e
bran
c
h 'ma/bas
h
-completion-l
e
a
king-x' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
M
erge branch 'jc/pus
h
-cert' in
t
o m
a
int
commit
|
commitdiff
|
tree
2015-04-22
Junio
C
Hamano
ignore: info/exclude should
trump
c
or
e
.
ex
c
ludes
f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Junio C Hama
n
o
Git 2
.
4
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Git 2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C Ha
m
ano
M
e
r
g
e br
a
nch
'j
k
/
colors'
into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
Merge branch
'
j
k/test
-
a
n
noyances'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
H
a
m
a
no
Merge branch 'pt/enter-repo-comment-fi
x
' into
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merg
e
branch 'jz/gitweb-
c
onf-do
c
-
fix' into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
Merge branch 'jk/che
r
r
y
-
pick-docfix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch 'iu/fix-
p
arse-
o
pti
o
ns-h-comment'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
unio C
H
amano
Merge br
a
nch 'jg/
c
g
uide-we-
c
a
n
n
o
t-count' into
main
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch
'jk
/
pack
-
cor
r
up
t
i
on-post-mortem' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
M
erge b
r
a
nc
h
'
jn/doc-fast-
i
mpor
t
-no-16-
o
ctopus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
a
m
ano
RelNotes: "merge --quiet" change has
been reve
r
t
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Ha
m
ano
H
opefully the la
s
t ba
t
ch
f
or
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
J
unio C Hamano
Mer
g
e bra
n
ch 'ps/grep-h
e
lp-
a
ll-
c
al
l
back-arg'
commit
|
commitdiff
|
tree
2015-04-20
Ju
n
io C Hamano
Merge b
r
a
n
c
h 'tb/connect-i
p
v6-
p
ar
s
e-fix'
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C Hamano
Mer
g
e bra
n
ch 'va/fix-gi
t
-p4-tests'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge branch 'jc
/
push-c
e
rt'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge bra
n
ch 'ma/
b
as
h
-
c
ompletion-lea
k
ing-
x
'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Ha
m
ano
fm
t
-merge-ms
g
: plug small l
e
ak of commit buf
f
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
J
u
n
io C
Hamano
Merge ta
g
'gitgui-0
.
20
.
0' of http://repo
.
or
.
cz/r/git-gui
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
attr: s
k
ip UTF8 BOM at
t
he
beginning
o
f the input
f
i
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Ha
m
ano
config: use
u
tf8_
b
om[]
f
rom utf
.
[ch] in git_pa
r
se
_
s
o
urc
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio
C Hamano
utf8-bom: introduce skip_utf8_bom(
)
h
elper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hama
n
o
add_excludes_from_file: clarif
y
th
e
bo
m
sk
i
pping
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio
C Hamano
Rever
t
"m
e
rge:
p
ass
v
e
rbosit
y
flag down to merge-recurs
i
ve"
commit
|
commitdiff
|
tree
2015-04-15
Junio C Hamano
parse_da
t
e_basic(): let
the system handle D
S
T conversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
Ju
n
io C Hamano
pa
r
s
e
_date_b
a
sic(): return ea
r
ly
w
hen
g
iven a bog
u
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Jun
i
o
C Hama
n
o
Git 2
.
4
.
0-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Junio C H
a
mano
M
e
rge bran
c
h
'jk/
c
o
lor
s
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ha
m
a
n
o
Merge branc
h
'jk/merge-quiet'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
M
erge
b
ranc
h
'jk/pa
c
k-cor
r
uption-po
s
t-mortem'
commit
|
commitdiff
|
tree
2015-04-14
Ju
n
io C
Hamano
Merge branch 'jc/update-instead-
i
nto-void'
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C
Ha
m
ano
Merge branch 'sb/plu
g
-streaming-leak'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge
b
r
anch 'jn/doc-fas
t
-import-no-16-octopus
-
limit'
commit
|
commitdiff
|
tree
2015-04-14
Junio
C
Haman
o
Me
r
ge
b
ranch 'sb
/
plug-wt-shortstatus-tracking-le
a
k'
commit
|
commitdiff
|
tree
2015-04-14
J
u
nio
C
Ham
a
no
M
e
rge
b
r
anch
'
pt
/
ente
r
-re
p
o-c
o
mment-fix'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merg
e
branch 'jz/gitweb-co
n
f-doc-fix'
commit
|
commitdiff
|
tree
2015-04-14
Junio
C
Hamano
Merge branch 'jk
/
che
r
ry-pick-docfix'
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C
Ha
m
a
n
o
Merg
e
branch
'
iu/fix-parse-op
t
ions-h-comment'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
Hamano
Merge branch 'jg/c
g
u
i
de-we-ca
n
not-count'
commit
|
commitdiff
|
tree
2015-04-09
Junio C Hamano
Merge tag
'
l
10n-2
.
4
.
0
-
rnd2
'
o
f git://gith
u
b
.
com/gi
t
.
.
.
commit
|
commitdiff
|
tree
2015-04-02
Juni
o
C Hamano
Git 2
.
4
.
0-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Jun
i
o C Hamano
Merge b
r
anch
'
sb/atom
i
c-push'
commit
|
commitdiff
|
tree
2015-04-02
Jun
i
o
C Hamano
push --signed: tighten
what the receiving end can
ask
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Ju
n
i
o C Ham
a
no
push-to-d
e
ploy
:
allow pushing into
a
n unborn
branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Junio C Ha
m
ano
Sy
n
c wit
h
2
.
3
.
5
commit
|
commitdiff
|
tree
2015-03-31
Juni
o
C Ham
a
n
o
Git 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Junio C Ha
m
a
no
M
erge
b
ranch
'ss/pull-re
b
a
se-preserve' in
t
o maint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
Merge branch
'
jc
/
report-
p
ath-error-to-d
i
r'
into maint
commit
|
commitdiff
|
tree
2015-03-31
Junio C
Hamano
Mer
g
e branch 'ph/
p
ush
-
doc
-
cas' int
o
maint
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C Ha
m
ano
Sync with
maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
RelNotes: min
o
r doc updates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C
Ha
m
an
o
Merge branch 'ph/pus
h
-doc-
c
as'
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C Hamano
Me
r
ge branch
'
ss/pull-
r
eba
s
e-preserve'
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Pre
p
a
r
e f
o
r 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge branc
h
'sg/completion
-
gitcomp-nl-for-refs'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Ham
a
no
Merg
e
bran
c
h 'jk/simpli
f
y-csum-file
-
sh
a
1fd-
c
heck'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io
C
Hama
n
o
Merge branch 'tg/test-
i
ndex-v
4
' into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-28
Junio C H
a
mano
Merge branch 'nd/doc-gi
t
-index-
v
ersion' into maint
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
i
o
C
Ham
a
no
Merge
b
r
anch
'
ct/pr
o
m
pt-
u
ntracked-fix' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2015-03-28
Junio
C Ham
a
n
o
Merge branc
h
'ws
/
grep-quiet-no-pager' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ha
m
ano
Me
r
ge branch 'jc/
s
ubmitting-
p
atches-mentio
n
-send
-
email
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C Ham
a
n
o
M
erg
e
b
r
anch
'
j
k
/cleanup-failed-clo
n
e' i
n
t
o
maint
commit
|
commitdiff
|
tree
2015-03-28
J
unio
C H
a
mano
Merge
b
r
anch
'
jk/fetch-pack
'
into main
t
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge bran
c
h 'tg/fix-c
h
e
ck-order-
w
i
th
-
split-index'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
H
a
m
a
no
Merge b
r
anc
h
'
j
k/prune
-
wit
h
-c
o
rrupt-
r
efs
'
into
m
aint
commit
|
commitdiff
|
tree
next