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 'mt/p4-depotFile-at-version'
2015-06-11
Junio C Hamano
Mer
g
e bran
c
h 'mt/p4-d
e
potFile-
a
t-versi
o
n'
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o C Hamano
Merge branch
'
mh/verify
-
lock-error-report'
commit
|
commitdiff
|
tree
2015-06-11
J
unio C
Hamano
Merge b
r
anc
h
'j
k
/col
o
r-dif
f
-plain-is
-
context'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch 'jk/c
l
on
e
-d
i
ssoc
i
a
t
e
'
commit
|
commitdiff
|
tree
2015-06-11
J
unio
C Hamano
Merge b
r
anch 'jc
/
diff-ws-error-highlight
'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Sync with
2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Git
2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Th
e
firs
t
half of the seventh batch for
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge branch 'ld/p4-ed
i
tor-mul
t
i-word
s
'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch '
b
c/o
b
ject-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
M
erge br
a
n
c
h
'jk/
a
t-pus
h
-sha
1
'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
M
erge branch 'dl/bra
n
ch-error-messa
g
e'
in
t
o
m
a
in
t
commit
|
commitdiff
|
tree
2015-06-05
J
uni
o
C
Hamano
M
erge branc
h
'j
k
/skip-
h
ttp-tests-und
e
r-no-curl'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Mer
g
e
b
ranch 'ps
/
doc-packf
i
le-vs-pack-file' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch 'fg/docu
m
ent-commi
t
-mes
s
age
-
s
trip
p
ing
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ham
a
no
Merge branch 'jk/rerere-forget-check-
e
nabled' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Mer
g
e br
a
nch 'pt
/
pull-log-n' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio
C Hamano
M
e
rge branch 'pt/pull-ff-v
s
-merge-ff' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Mer
g
e branch 'rs/
p
l
u
g-
l
e
a
k-in-pack-bitmaps' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
Hamano
Merge br
a
nch 'ja
/
tutorial-ascii
d
octor-f
i
x'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch 'jk/strip
s
pace-asciidocto
r
-fix
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge branch
'
jk/asci
i
doc-mar
k
up-fix'
into main
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Haman
o
Merge branch 'ps
/
bundle-ver
i
f
y
-arg' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
J
uni
o
C H
a
mano
M
erg
e
branch 'mh/write-refs-sooner-2
.
4' i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
J
uni
o
C Hama
n
o
Merge branch 'm
h
/ref-
d
irector
y
-file' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
m
ano
Merge branch 'mg/log-decor
a
te-HEAD'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ham
a
no
M
erge br
a
nch 'sb
/
t1020-cleanup' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
H
amano
Merge branch '
j
c/gitignore
-
p
recedence' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C
Hamano
Me
r
g
e
branch
'
b
c/
c
onnect-plink' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Ha
m
ano
Me
r
g
e bra
n
ch 'ph/rebase-i-re
d
o' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Ham
a
no
M
e
rge branch 'jk/add-e-kill-e
d
itor' into
main
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C H
a
m
ano
Merge branch 'mh/clo
n
e-verbosit
y
-fi
x
'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C H
a
ma
n
o
Merge
b
r
anch 'jk/sha1-file-reduce-useless-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'tb/b
l
ame-resu
r
rect-convert-to
-
git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
Hamano
Me
r
ge branch 'jc/plug-
f
mt-mer
g
e-
m
sg-leak' into
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
ama
n
o
Merge
b
ranch 'pt/
x
dg-config-pa
t
h' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Sixth b
a
tch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
J
unio
C
H
amano
Mer
g
e
b
ranch 'sb
/
test-bitmap-fr
e
e-a
t
-
end'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
Merge
b
ranc
h
'mm/rebase-i-pos
t
-rewrite-
e
xec
'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge
b
ranc
h
'fm/fetch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Ha
m
ano
Merg
e
b
r
anch 'sg/help-group'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Mer
g
e
b
r
anch 'mm/log-format-ra
w
-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Me
r
ge branch 'dt/cat-file-
f
ollow-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge branch 'rs/jan
i
torial'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C
H
amano
Mer
g
e
b
ranch 'j
k
/s
t
ash-options'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge
br
a
nch
'da/merget
o
ol-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Mer
g
e branc
h
'mc/c
o
mmi
t
-do
c
-
g
r
ammofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merg
e
branch 'jh/filter-empty-contents'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge branch 'a
h
/us
a
g
e
-strings'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio
C
Hamano
Merge
bra
n
ch 'jk/http-back
e
n
d-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hama
n
o
Me
r
ge bran
c
h 'dt/clean-pathspec-filt
e
r-then-lstat'
commit
|
commitdiff
|
tree
2015-05-27
Miguel T
o
r
r
oja
p
4
:
r
etriev
e
the r
i
ght re
v
ision of the fil
e
in UTF
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggert
y
re
f
_transaction_com
m
it(
)
: do not
capitalize error mess
a
g
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mi
c
hael
H
agge
r
t
y
verify_lock():
d
o not ca
p
italize erro
r
mess
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
ichael
H
aggerty
verify_
l
o
ck():
report errors via a
s
trbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff
.
h: renam
e
DIFF_PLAI
N
c
o
lor slo
t
to DIFF_CO
N
TEXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff K
i
ng
dif
f
: accept color
.
diff
.
c
o
ntext
as a
s
ynon
y
m
f
or "p
l
ain"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Ju
n
i
o
C Hamano
Merge b
r
anch 'nd
/
u
ntracked-
c
ac
h
e'
commit
|
commitdiff
|
tree
2015-05-27
J
eff
K
ing
t7063: hide stderr fro
m
se
t
up inside prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
icha
e
l
H
agg
e
rty
v
e
rify_lock(): on er
r
ors
,
let
t
he
c
a
ller unlock t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
ve
r
ify_lock(): return 0
/
-1
r
a
t
her t
h
an s
t
ru
c
t ref_l
o
c
k
*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
King
clone: r
e
order --dissocia
t
e
an
d
--reference option
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
King
clone: use OPT
_
STRING
_
LIST for --r
e
feren
c
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Ha
m
ano
diff
.
c
: -
-
ws-
e
rror-
h
i
ghl
i
ght=<kind>
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
diff
.
c: add emit
_
d
el_line() and emit_con
t
e
xt_
l
in
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
Sync w
i
th
2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
J
u
ni
o
C Hama
n
o
M
e
rge branch 'jk/s
t
ill-
i
nteresting
'
into maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C
H
a
mano
Merge branch 'jc/hash-object' int
o
maint
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Merge bra
n
ch 'jk/rebase-quiet-no
o
p'
into maint
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io
C
H
a
mano
Merg
e
b
r
an
c
h '
s
g
/comp
l
ete-decora
t
e-
f
ull-not-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
Me
r
ge
b
r
a
n
ch 'jk
/
filter-branch-
u
se-of-sed-o
n
-
i
ncomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Haman
o
Me
r
g
e
branch
'jc/daemon-no-
i
pv6-for
-
2
.
4
.
1' into
maint
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o
C
Haman
o
Mer
g
e branch 'jk/stash-require-clean
-
index
'
in
t
o main
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
erge branch 'jk/git-no-
m
ore
-
argv0-path
-
munging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
Fifth batch
f
or 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch
'
n
d
/untracked-cac
h
e'
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Merge branch 'rs
/
plug-le
a
k-in-pack-bitmaps'
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hamano
Merg
e
branch 'pt/pull-ff-vs-m
e
rge-f
f
'
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
H
am
a
n
o
Merge branch
'pt/pull-log-n'
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Hamano
Mer
g
e branch
'
jk/rere
r
e-forget-ch
e
ck-enabled'
commit
|
commitdiff
|
tree
2015-05-26
L
u
ke Diamand
gi
t
-p4: tests:
u
se test-c
h
mti
m
e in place of t
o
uch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
t4015: se
p
ara
t
e
c
ommon
s
etup and pe
r
-test expectation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o
C
Hamano
t
401
5
: modernise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Hama
n
o
Merge bran
c
h 'jk/
h
tt
p
-backen
d
-deadlock-2
.
3' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o
C Ha
m
a
n
o
Merge branch 'jk/http
-
backend-dea
d
lock-2
.
2' i
n
to jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff King
http-
b
ackend: spool ref
n
egotiation requests to buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
struct ref_
l
ock: convert old_sha1 member to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
H
a
ggert
y
w
arn_if_d
a
ngling_sy
m
ref(): co
n
vert loc
a
l variable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
H
aggerty
each_ref_fn_a
d
apter(): re
m
ove ada
p
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Hag
g
e
rty
rev_list_
i
n
s
e
rt_ref(): remove unne
e
d
ed arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el H
a
ggerty
rev_list_insert_
r
ef_
o
id(
)
: ne
w
fu
n
ction, taking
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Haggerty
mark_c
o
mplete()
:
re
m
ove
unneeded argum
e
nt
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
m
a
rk_com
p
lete_oid(): new
fu
n
ctio
n
,
taking
a
n
o
bject_
o
id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Haggerty
clear_marks(): rewrit
e
to take an object_id
a
r
g
u
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Haggerty
m
a
rk
_
co
m
plete(): rewrite to
tak
e
an ob
j
ect
_
id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
gg
e
rty
s
e
nd_re
f
(
)
:
co
n
vert local vari
a
ble "peeled" t
o
object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
g
g
erty
upload-pack: rewrite
f
u
n
c
t
ions to take object_id
a
r
g
u
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
ggerty
find_sym
r
ef(): con
v
ert local variable
"unused" to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
find_
s
y
mr
e
f(
)
: re
w
r
i
te
t
o take
an object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next