repo.or.cz
/
alt-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 'jk/at-push-sha1'
2015-05-11
Junio
C
Hamano
Merge b
r
anch 'jc/hash-object'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hama
n
o
Merg
e
branc
h
'sb/prefi
x
-path-free-results'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branch 's
g
/completion-no
-
redu
n
d
a
nt-all-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
H
a
mano
Merg
e
branch 's
g
/comple
t
e-
d
eco
r
ate-
f
ull-not
-
l
ong'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merge bran
c
h
'jk/filt
e
r-
b
ran
c
h-use-of-sed-on-in
c
o
m
p
l
e
te
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio
C Hamano
Merge bran
c
h
'jc
/
da
e
mon-
n
o-ipv6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
bran
c
h 'jn/clean-use-error-not-fpr
i
n
t
f
-
o
n-stder
r
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
M
e
rg
e
branch 'tb/b
l
ame-resurrect
-
convert-to-git'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o
C Hamano
M
e
rge branch 'va/fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C
Hamano
Merge branch 'ld/p4-case-fold'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
M
erge
b
ranch 'j
k
/rebase-qu
i
et-noop'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'va/p4-client-pat
h
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branch
'
m
m/add-p-split-er
r
or'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge
bran
c
h 'tb/t0027
-
crl
f
'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C H
a
ma
n
o
Merge bran
c
h
'ls/p
4
-changes-b
l
o
ck
-
size'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C
Ham
a
no
Merge branc
h
'jc/plug
-
fmt-merge-msg-leak
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Mer
g
e
b
r
a
nch 'nd/
s
lim-index-pack-memory
-
usage'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
M
erge
b
ran
c
h
'jk/still-interestin
g
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Ham
a
no
Merg
e
branch 'jk/reading-
p
acked-refs'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o C Hamano
Merge branch 'lm/squelch-
b
g-progress'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ham
a
n
o
Merge
bra
n
ch 'jk/s
h
a1-file-reduce-u
s
eless
-
warn
i
n
gs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge
branch 'nd
/
mul
t
iple-work-trees'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Haman
o
Merge branch 'pt/credential-x
d
g
'
commit
|
commitdiff
|
tree
2015-05-07
Junio C Ham
a
no
tests: skip dav
h
ttp-push
tests unde
r
NO_E
X
PAT=NoThank
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C
H
amano
First 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-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
H
ama
n
o
M
erg
e
br
a
n
c
h 'mm/usage-log-l-ca
n
-
t
a
ke-r
e
gex'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
Ha
m
ano
Merge branch
'ep/fix-
t
e
s
t-lib-functions-report'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merg
e
branc
h
'cn/b
o
m-in-g
i
tign
o
r
e'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Ha
m
ano
Merge branch 'jc
/
epochtim
e
-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Ha
m
ano
Merg
e
bra
n
c
h
'nd/t1509-chroot-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
b
r
a
n
c
h
'oh/fix-config-d
e
fault-use
r
-na
m
e-section'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
H
a
m
an
o
Merge branch 'jk/t
y
pe-f
r
om-string-gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
rge bra
n
ch 'sb/test-bit
m
ap-
f
ree-at-e
n
d'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge branc
h
'ld
/
p
4
-filet
y
pe-det
e
c
tion'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Merge branch 'ts/
c
heckout
-
a
d
vice-plural'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge branch 'j
k
/init-core-
w
orktree-at-roo
t
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
ni
o
C Hamano
Merge
branch 'mh
/
show-branch-t
o
p
i
c'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o
C Ham
a
n
o
M
erge branch
'sb/line-log-plug-pairdiff-leak'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Ha
m
ano
Merge bra
n
ch 'jc/diff-no-inde
x
-d
-
f'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C H
a
mano
Merge branch 'bc/obje
c
t
-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
d
a
emon: unbreak NO_IPV6 b
u
ild regression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hama
n
o
write_s
h
a1_file(): do no
t
use a separate
sh
a
1[] arra
y
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
:
depreca
t
e 'git merg
e
<message> HEAD <commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hama
n
o
merge
:
han
d
le F
E
TCH_H
E
AD intern
a
l
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
m
erge: decide if we auto-genera
t
e the
message early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
amano
merge:
m
ake coll
e
ct_parents() a
u
to-generat
e
the merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: extract prepare_merge_me
s
sag
e
()
lo
g
ic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
a
mano
me
r
ge: narrow scop
e
of
merge_n
a
m
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
split redu
c
e_paren
t
s(
)
out of collect_pare
n
ts(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: cl
a
r
ify collect_parents()
logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
m
er
g
e: sm
a
ll leak
f
ix and code
simplifi
c
atio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hama
n
o
merge
:
do not
check argc t
o
determine number o
f
remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
merge: clarify "p
u
lling in
t
o
v
oid" s
p
ecial case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C
Haman
o
t
5
520: test
p
u
ll
i
n
g
an o
c
topus
i
nto a
n
u
n
b
orn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t
5
520: style
f
ixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C Hamano
merge: simpl
i
f
y
code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C
Hamano
me
r
g
e: test the
t
o
p
-level merge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
J
u
n
io C
H
ama
n
o
test: va
l
i
d
ate prerequistes syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Jun
i
o
C Hamano
Merge branch 'm
h
/mul
t
imail-renewal
'
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Ham
a
no
Merge branch
'
mg/
s
h
o
w-notes-
d
oc
'
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
io C Hamano
Merg
e
bran
c
h 'nd/versioncmp-
p
re
r
eleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Ha
m
a
no
Merg
e
branch 'mg/status-v-v'
commit
|
commitdiff
|
tree
2015-04-27
Junio
C
H
a
m
ano
Sync wit
h
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C Hamano
Git 2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Ham
a
no
Mer
g
e branch 'tb/connect-ip
v
6-parse-fix' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merg
e
branch 'ma/bash-comple
t
i
o
n-lea
k
ing-x' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio
C
Hamano
Mer
g
e
b
r
anch 'jc
/
push-cert' into main
t
commit
|
commitdiff
|
tree
2015-04-22
Junio
C Hamano
i
g
nore: info/
e
xclude shou
l
d trump core
.
excludesfile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-22
Ju
n
i
o C Hamano
Git 2
.
4
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Hamano
Sync
w
i
th maint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io
C Hama
n
o
G
i
t
2
.
3
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hama
n
o
M
e
r
ge
b
r
anch 'jk/colo
r
s' in
t
o main
t
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hama
n
o
Merge branch 'jk/test-annoyances' i
n
to maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
M
e
rge bra
n
c
h 'pt/enter
-
repo-c
o
mment
-
fi
x
' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Me
r
ge branch 'jz
/
gitweb-c
o
nf-doc
-
fix' i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C
H
amano
Merge br
a
nch 'jk/cherry-
p
ick-d
o
cfix'
into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Me
r
g
e
bra
n
ch
'
iu/fix-parse-options-h
-
commen
t
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Ham
a
no
Merge b
r
a
n
c
h 'jg/cg
u
i
d
e
-we
-
cannot
-
count' into
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ha
m
a
no
Merge branch
'jk/pack-corruption-post-mortem' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
uni
o
C H
a
mano
Merge branch 'jn/d
o
c-fast-import-no-16
-
oc
t
opus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
n
i
o C Ham
a
no
RelNotes:
"
merg
e
--quiet" change
has been reverted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
J
u
n
io C Hamano
Hopefully t
h
e
last batch
f
or 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
Junio
C Hamano
Merge
b
ranch 'ps/grep-help-all-callback-arg
'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Me
r
ge branch '
t
b/connect-ipv6-parse-fi
x
'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge
branch 'va/fix-git-p4-tests
'
commit
|
commitdiff
|
tree
2015-04-20
Junio C
H
a
m
ano
Merge b
r
a
n
ch '
j
c/push-cer
t
'
commit
|
commitdiff
|
tree
2015-04-20
Junio C
Ha
m
a
no
Me
r
ge branc
h
'ma
/
bash-
c
o
mpl
e
tion-le
a
ki
n
g-x'
commit
|
commitdiff
|
tree
2015-04-20
Junio C
Hamano
fmt-merge-msg: p
l
ug small l
e
ak of commit buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-19
Ju
n
i
o
C
Ha
m
ano
Merg
e
tag 'gitgui-0
.
20
.
0' of http://re
p
o
.
o
r
.
cz/r
/
git-gui
commit
|
commitdiff
|
tree
2015-04-16
Junio C H
a
mano
a
t
tr:
s
kip
U
TF8 BOM at the beginning o
f
the input fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Ha
m
ano
confi
g
:
us
e
ut
f
8_bom[] fr
o
m
utf
.
[ch] in
git
_
p
a
rse_source()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio
C
H
ama
n
o
u
tf8-bom: introd
u
c
e s
k
ip_utf8_bom() helpe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C H
a
mano
add_excludes_from_file: clarify the bom
s
kipping log
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
Revert "merg
e
: pass ve
r
bosit
y
f
lag down to merge-recursive"
commit
|
commitdiff
|
tree
2015-04-15
J
u
nio
C
Hamano
parse_da
t
e_basic(
)
: let
the s
y
stem handle DS
T
conve
r
s
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
Junio C Haman
o
p
a
rse
_
date_basic():
r
eturn early w
h
en g
i
v
e
n a
b
ogus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C Hamano
Git 2
.
4
.
0-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Jun
i
o C
H
amano
M
e
r
g
e
branch 'jk/colo
r
s'
commit
|
commitdiff
|
tree
next