repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/stash-options'
2015-05-11
Junio
C
Ha
m
an
o
Merge bran
c
h
'jk/rebase-quiet
-
noop
'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge branch 'va/p4
-
cl
i
e
n
t
-path'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Merge branch 'mm/add-p-spli
t
-
e
rro
r
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branc
h
'tb/t0027-crlf'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merge branch 'ls/p4-changes-block-size'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C H
a
mano
M
e
rge bra
n
ch 'jc/plug-fmt-me
r
ge-
m
sg-leak'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C
Haman
o
Merge branch 'nd/slim-index-
p
ac
k
-memory-
u
sage'
commit
|
commitdiff
|
tree
2015-05-11
J
uni
o
C Ha
m
ano
M
erge branch
'
j
k
/still-
i
nte
r
esting'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Mer
g
e branch 'jk/rea
d
i
n
g
-
packe
d
-
r
efs'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
M
er
g
e br
a
nch 'lm/squelch-
b
g
-pr
o
gress
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ham
a
no
Merge b
r
anch 'jk/sha
1
-file-reduc
e
-
useless-warnings'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merg
e
branch 'nd/multipl
e
-wor
k
-
t
rees'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Me
r
g
e
br
a
nch 'pt/c
r
e
d
ential
-
xdg'
commit
|
commitdiff
|
tree
2015-05-07
J
u
nio C
H
amano
tests: skip
dav http-push
t
ests u
n
der NO_EXPA
T
=NoThanks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Fir
s
t batch for
2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge branch 'jk
/
prune-m
t
im
e
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
rge branch
'
m
m/us
a
ge-l
o
g-l-can-take-
r
eg
e
x
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bran
c
h
'ep/f
i
x-te
s
t-l
i
b-functions-r
e
port'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Mer
g
e branc
h
'
c
n
/bom-in-gitignor
e
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Haman
o
Merge branch 'jc/epochtime-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
Merge branch 'nd/t1509-chroot-t
e
st'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o C Hamano
Merge branch 'oh/f
i
x-config-default
-
u
ser-
n
am
e
-se
c
tion'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branc
h
'jk/t
y
pe-fr
o
m
-stri
n
g
-
gentl
y
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
io
C
Hamano
Mer
g
e
b
r
a
n
ch 'sb/test-b
i
t
map-free-at-e
n
d'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
H
amano
M
erge bra
n
ch 'ld/p4-filetype-detection'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
M
e
rge branch '
t
s/chec
k
out-a
d
vi
c
e-
p
lural'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
rge
b
ranch 'jk/init-core-wor
k
t
r
ee-at-roo
t
'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Me
r
g
e bra
n
ch
'
mh/s
h
o
w-branc
h
-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge b
r
a
n
ch 'sb/line-log
-
plug-pa
i
rdi
f
f-leak'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
M
e
rge b
r
anch
'jc/diff-n
o
-i
n
dex-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
ama
n
o
Merge branch 'bc/object-
i
d
'
commit
|
commitdiff
|
tree
2015-05-05
Juni
o
C H
a
m
a
no
daemo
n
: unbr
e
ak
N
O
_
IPV6
build regr
e
s
s
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
Juni
o
C Hamano
write_sha1_file(
)
: do n
o
t use a separat
e
sha1[] array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
Junio C Hamano
Git 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merg
e
:
d
e
p
recate 'gi
t
merge <
m
essag
e
> HEAD <co
m
mit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge: handle FE
T
CH_HEAD i
n
t
e
rnally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
d
ec
i
d
e if we au
t
o-generate t
h
e messa
g
e
e
arly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
merge: make col
l
ect_parents() au
t
o
-generate the
m
erge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
m
e
rge: extract prep
a
r
e_m
e
rge_mes
s
age() logic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C
H
amano
merge: na
r
row
s
cop
e
of mer
g
e_nam
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
merge: split r
e
duce_parents()
out of
c
o
llect_parents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: clarify collect_parent
s
(
)
lo
g
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Ha
m
ano
merg
e
: smal
l
leakfix and code simplification
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
aman
o
me
r
ge: do not
check arg
c
to determine number of remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
amano
merge
:
clarify "pull
i
n
g
i
n
t
o
void" special
c
a
se
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t
5
520
:
tes
t
pulling an octopus
i
nto an unborn bra
n
ch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C
H
am
a
no
t5520
:
style fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
i
o
C
Hamano
mer
g
e: simplify code flo
w
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
m
e
rg
e
: te
s
t the
top-lev
e
l merge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
H
amano
test
:
v
alidat
e
prerequistes s
y
ntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
H
amano
M
erge branch
'
mh/multimail-renewal'
commit
|
commitdiff
|
tree
2015-04-28
Junio C
H
a
mano
Merge br
a
nch
'
mg/show-
n
o
t
es-doc'
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C
Hamano
Mer
g
e branch
'
n
d/vers
i
oncmp-pre
r
eleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Me
r
ge branch
'm
g
/stat
u
s-v
-
v'
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C Ha
m
ano
Sync
w
i
th 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
J
u
nio C
Hamano
G
i
t
2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge br
a
n
ch
'tb/connect-ipv6-parse-fix
'
into maint
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C Hamano
Merge br
a
nch 'ma/bash-co
m
pletion-lea
k
i
n
g
-x' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio
C
H
amano
Merge
branch
'
jc/push-cert' int
o
main
t
commit
|
commitdiff
|
tree
2015-04-22
Junio C Hama
n
o
ignore
:
info/exclude should
t
rump c
o
r
e
.
excl
u
desfile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-22
Jun
i
o C
H
amano
G
it
2
.
4
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Syn
c
with
m
aint
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Git
2
.
3
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge bra
n
ch 'j
k
/col
o
rs' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Haman
o
Merge branch 'jk/test-anno
y
ance
s
' in
t
o maint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
i
o C H
a
mano
Merge branch '
p
t/ent
e
r-repo-comment-fix' into m
a
int
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
Mer
g
e branch
'jz/gitweb
-
conf-doc-fix
'
into main
t
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C
Hama
n
o
Me
r
g
e
b
r
anch
'
jk/ch
e
r
ry-
p
i
ck-
d
ocfix'
i
nto maint
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o
C Hamano
M
erge b
r
anch 'iu/fi
x
-parse-o
p
tions-h-comment' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
Merge branch 'jg/cguide-we-ca
n
not-count' into m
a
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch
'
jk/pac
k
-corruption-post-mor
t
em' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Ha
m
ano
Merge branch 'j
n
/
d
oc-fast-import-no-16-octopus-li
m
it
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o
C Hamano
RelNot
e
s: "m
e
rge --quiet" change ha
s
b
e
en rev
e
rted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
J
unio C
H
amano
Hopefully
t
he
l
as
t
batch for 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge branch 'ps/grep-help-all-callback-
a
rg'
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C H
a
m
a
no
Merg
e
branch
'
tb/c
o
nne
c
t-ipv6-pars
e
-fix'
commit
|
commitdiff
|
tree
2015-04-20
Ju
n
io
C
Hamano
Merge branc
h
'va/fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-04-20
Junio
C Hamano
Merge branch 'jc/
p
ush-c
e
rt'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Mer
g
e
b
ranch 'ma/bash-
c
ompletion-
l
eak
i
n
g
-
x'
commit
|
commitdiff
|
tree
2015-04-20
Junio
C Ham
a
no
f
m
t-merge-msg: plug
s
m
a
ll leak of commit bu
f
fer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-19
Juni
o
C Hamano
Merge
t
a
g
'gitgu
i
-0
.
20
.
0' of ht
t
p
://repo
.
or
.
cz/r/git-gui
commit
|
commitdiff
|
tree
2015-04-16
Juni
o
C
Hamano
attr: ski
p
U
T
F8 BOM at t
h
e begin
n
ing of the input fil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
config: use utf8_b
o
m[] from ut
f
.
[ch
]
in
git_parse
_
source()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
utf8-bom: int
r
oduce skip_utf8_bom(
)
help
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio
C Hamano
add_exclu
d
e
s_from_file: cl
a
rify the
bom
s
k
ipp
i
ng logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C
H
am
a
no
Revert "me
r
ge: pass verbo
s
ity flag
down to merge-recursive"
commit
|
commitdiff
|
tree
2015-04-15
J
u
n
io C Ham
a
no
pars
e
_date
_
b
a
sic(): let the system handle DST co
n
versi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
J
u
nio C Hamano
parse_date_
b
asic(): return earl
y
w
hen
gi
v
en a bogus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Junio C
H
a
mano
Git 2
.
4
.
0-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Junio C
Hamano
Merge br
a
nch 'jk/colors'
commit
|
commitdiff
|
tree
2015-04-14
Junio
C
Hamano
Merge branch 'jk/
m
erge
-
q
uiet'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge bran
c
h 'jk/pack-corruption-
p
o
s
t-mor
t
em'
commit
|
commitdiff
|
tree
2015-04-14
Ju
n
io
C
Hamano
Merge
branch 'j
c
/up
d
ate-
i
nstead-into-void'
commit
|
commitdiff
|
tree
2015-04-14
J
u
n
i
o C Hamano
M
e
rge br
a
nc
h
'sb/plug-
s
tr
e
aming-
l
eak'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
H
am
a
no
M
erge branch 'jn/doc-fast-import-no-16
-
oc
t
opus-limit'
commit
|
commitdiff
|
tree
2015-04-14
Ju
n
io C
H
aman
o
Merge branch 'sb/pl
u
g
-wt-shortstatus-tracking-l
e
ak'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
M
e
rge branc
h
'pt/enter-repo-comment
-
f
ix'
commit
|
commitdiff
|
tree
2015-04-14
Ju
n
io C Ha
m
ano
Merge branch 'jz/g
i
t
web-con
f
-d
o
c-f
i
x
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge branch 'j
k
/ch
e
rry-pick-docfix'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ham
a
no
Merge bran
c
h
'iu/fix-parse-
o
ptions-h
-
comm
e
nt'
commit
|
commitdiff
|
tree
next