repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ld/p4-editor-multi-words'
2015-05-11
Junio C Hamano
Merge branch 'pt/xdg
-
c
o
nfig-p
a
th'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
M
erge branch '
e
p
/do-not-feed-a-point
e
r-to-arr
a
y
-
s
ize'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bra
n
ch 'jc/h
a
sh-o
b
jec
t
'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Mer
g
e
b
ran
c
h 'sb/
p
refix-pa
t
h-free-
r
esults'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merge
bra
n
ch 'sg/
c
omple
t
io
n
-no-re
d
un
d
ant-
a
ll-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merge branch 'sg/co
m
plete-decorat
e
-fu
l
l-
n
ot-long'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C H
a
m
ano
Merg
e
bra
n
ch
'
j
k
/
filt
e
r-branch-use-of-sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Ha
m
an
o
Merge branch
'jc/daemon-no-
i
pv
6
-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o C Haman
o
Merge branc
h
'jn
/
clean-use-e
r
ror-not-fprintf-o
n
-stderr'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Merge branch 'tb/blame-resurrect
-
c
o
n
vert-
t
o-git'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C
H
amano
Mer
g
e bra
n
ch 'va/fix-
g
it-p4-tests'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C H
a
mano
Merge branch 'ld/p4-case-f
o
ld
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
b
r
a
nc
h
'jk/re
b
ase-quiet-noop'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branch 'va/p4-c
l
i
e
n
t
-path'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C
H
amano
Merge
branch 'mm/add-p-s
p
lit-error'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Ha
m
ano
M
er
g
e bran
c
h
'
tb/t0027-crlf'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Mer
g
e bran
c
h 'ls/p
4
-changes-block-size'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C
H
aman
o
Merge branch
'
jc
/
plug-fmt-m
e
rge-msg-leak'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
M
e
rge
b
ranch 'nd/s
l
im-index-pack-memory-u
s
ag
e
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
b
r
an
c
h 'jk
/
sti
l
l-interesting'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge br
a
n
ch '
j
k/reading-pack
e
d-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge branc
h
'lm/squelch-bg-progres
s
'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C H
a
m
a
no
Merge branch 'jk/sha
1
-
f
i
l
e-reduc
e
-useless-wa
r
nings'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge branch 'nd/multip
l
e-w
o
rk-trees'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C
Hamano
M
e
r
g
e
br
a
nch
'
pt/credentia
l
-xdg'
commit
|
commitdiff
|
tree
2015-05-07
Junio C Haman
o
tests:
skip dav http-push tests under NO_EXPAT=NoThan
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
F
irst batch
for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
rge branch 'jk
/
prune-
m
time'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Haman
o
Me
r
g
e
branch 'mm/usag
e
-log-l-can-take-r
e
g
ex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge branch 'ep/fi
x
-
te
s
t-lib-fu
n
c
t
ions-report'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Haman
o
Merge bra
n
ch
'
cn/b
o
m-in-gitignor
e
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
Merge
branch 'j
c
/epochtime-
w
o-
t
z'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C H
a
mano
M
e
rge branch
'
nd/t
1
509-chr
o
ot-tes
t
'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C
H
amano
Merge branch 'oh/fix-config-defau
l
t-user-
n
am
e
-se
c
ti
o
n'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C
Hamano
M
e
rge b
r
a
nch 'jk/type-from-st
r
ing-gen
t
ly
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio
C Hamano
M
e
r
g
e bran
c
h '
s
b/t
e
st-bit
m
ap
-
free-a
t
-en
d
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge bra
n
ch 'ld/p4-filet
y
p
e
-dete
c
tion'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'ts/
c
heckout-advice
-
p
lural'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Me
r
ge br
a
n
ch 'jk/i
n
i
t
-core-worktree-at-ro
o
t'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
M
e
rge branch 'mh/show
-
branc
h
-to
p
ic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bra
n
ch 'sb/line-log-
p
l
u
g
-
pairdiff-lea
k
'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge bra
n
ch 'jc/di
f
f-
n
o-index-d-
f
'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o C Ha
m
ano
Merge bran
c
h '
b
c/
o
bject-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio
C
H
amano
d
aemon: un
b
reak NO_IPV6 buil
d
r
e
gres
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
J
u
nio
C
Hamano
w
ri
t
e_s
h
a1_f
i
le(): do not use a separ
a
te
sha1[]
array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio C Ham
a
no
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio
C
Ham
a
no
merge: depr
e
cate 'git
merge <
m
essage>
H
EAD <
c
ommit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
handle
F
ETCH_HEAD internally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
aman
o
merge: decide i
f
we auto-ge
n
erate the mes
s
a
ge
e
arly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C
H
a
mano
me
r
g
e: m
a
ke collect
_
parents() auto-g
e
nerate t
h
e merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
mer
g
e
: extract prepare_merge_message() l
o
gic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C
Hamano
m
e
rge: narrow s
c
op
e
o
f
m
e
r
ge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C H
a
mano
merge:
split re
d
uce_parents() out of col
l
ect_parents
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merge: clarify col
l
e
c
t
_parent
s
() lo
g
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
me
r
ge: small lea
k
fix
an
d
code
simp
l
i
fication
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Ha
m
an
o
mer
g
e: do no
t
check argc to determine number
o
f
remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merge: cl
a
r
i
fy "pulling into voi
d
" sp
e
cial case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
H
a
m
an
o
t5
5
20: test pulli
n
g a
n
o
ctop
u
s
into
an unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t
5
520: st
y
le
fixe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io
C
Ha
m
a
no
mer
g
e: simplify co
d
e flo
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
n
o
merge: tes
t
the top-level merg
e
driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
J
u
n
i
o
C Hamano
te
s
t: valida
t
e pr
e
requ
i
s
t
es syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Jun
i
o C Ha
m
a
no
M
erge bran
c
h
'
mh/multimai
l
-renewal'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Haman
o
Merge branch
'mg/s
h
ow-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge b
r
anch 'nd/vers
i
oncmp-prereleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Haman
o
M
erg
e
b
r
anch
'
mg/status
-
v-v'
commit
|
commitdiff
|
tree
2015-04-27
J
u
nio C Hamano
S
ync with
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Git 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio
C
H
amano
M
erge
branch 'tb
/
connect-ipv6-pa
r
se-fix'
into maint
commit
|
commitdiff
|
tree
2015-04-27
J
u
n
i
o C Hama
n
o
M
e
rge branc
h
'ma/bash-completion-leaking-x' into mai
n
t
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Me
r
ge b
r
anch 'jc/push-cert' into maint
commit
|
commitdiff
|
tree
2015-04-22
J
u
n
io C Hamano
ig
n
ore: info/exclude should trump core
.
e
xclu
d
esfile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jun
i
o C
Haman
o
Git
2
.
4
.
0
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio
C Hamano
Sync
w
ith main
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ham
a
n
o
Git
2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Haman
o
Merge branc
h
'jk/colo
r
s' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hama
n
o
M
e
rge branc
h
'jk/test-annoyances' in
t
o maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Haman
o
Mer
g
e branch '
p
t
/
ent
e
r-repo-comment
-
f
i
x'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
Me
r
ge branch 'jz/g
i
tweb-conf-doc-fi
x
' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ham
a
no
Merge branch 'jk/cherry-
p
ick
-
d
oc
f
ix' into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Merge branch '
i
u
/
fix-parse-options-h-c
o
mm
e
nt' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
M
erg
e
branch 'jg/cguide
-
w
e
-cannot-coun
t
' into
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ham
a
no
Merge branch 'jk
/
pack-corruption-post-mort
e
m' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Hamano
Mer
g
e
b
r
a
nch 'jn/doc-
f
ast-
i
m
p
o
rt
-
no-16-oct
o
pus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C Hamano
R
elNo
t
es
:
"merge --qu
i
e
t
"
change
has been
reverted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Haman
o
Hope
f
ully
t
he last batch for 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge
branch '
p
s/grep-help-all-callback-a
r
g
'
commit
|
commitdiff
|
tree
2015-04-20
Junio
C Hama
n
o
Merge branch 'tb/connect-i
p
v
6
-pa
r
se-fix'
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C Ha
m
ano
Merge
b
ranch 'va/f
i
x-g
i
t-p
4
-te
s
ts'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
M
e
rge branch
'jc/push-cert'
commit
|
commitdiff
|
tree
2015-04-20
J
unio C Hama
n
o
M
e
rge b
r
anch 'm
a
/b
a
sh-completion-leaking-
x
'
commit
|
commitdiff
|
tree
2015-04-20
Junio
C
Hamano
fmt-merge-msg: plug small leak of commit buf
f
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
J
u
nio C Hamano
M
e
rge
t
a
g
'
gi
t
gu
i
-0
.
20
.
0' o
f
http://repo
.
or
.
cz/r/
g
i
t-
g
ui
commit
|
commitdiff
|
tree
2015-04-16
Jun
i
o
C
Ham
a
n
o
attr: skip UTF8 BOM
at the beginn
i
ng
of
the inpu
t
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
J
u
n
i
o
C Hamano
config
:
use
u
tf
8
_bom[
]
fr
o
m utf
.
[ch
]
i
n
git
_
par
s
e_sourc
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
u
t
f8-bom: introduce skip_utf8_bom() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Juni
o
C Ha
m
an
o
add_exclu
d
es_from_file: clarify the bom sk
i
p
p
ing logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Juni
o
C Ham
a
no
Rever
t
"merge: pass verbosity flag
d
o
wn to merge-recursive"
commit
|
commitdiff
|
tree
2015-04-15
Ju
n
i
o
C Hamano
parse_date_basic
(
):
let the
system ha
n
dle DST conver
s
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
Junio C Hama
n
o
parse_date_basic(): return early when gi
v
en
a
bogus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next