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: teach -Xours/-Xtheirs to binary ll-merge driver
2012-02-13
Junio
C Hamano
Merge b
r
a
n
ch 'jc/bra
n
ch
-
de
s
c
-
typoavoidance
'
into maint
commit
|
commitdiff
|
tree
2012-02-13
Ju
n
io C Ham
a
no
Merge branch 'jn/rpm
-
sp
e
c' into maint
commit
|
commitdiff
|
tree
2012-02-10
J
u
nio C Hamano
U
pdate draft rele
a
se notes to 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-10
J
u
n
i
o C
Hamano
Me
r
ge
b
ranch 'jc/maint-
r
equest-
p
u
l
l-for-t
a
g'
into maint
commit
|
commitdiff
|
tree
2012-02-10
Jun
i
o C Hamano
Me
r
ge br
a
nch
'
tr/gr
e
p-l-with
-
decoration
'
into main
t
commit
|
commitdiff
|
tree
2012-02-10
Junio C Hamano
Merge
b
r
a
n
ch '
j
l/submodule-re-
a
dd' into main
t
commit
|
commitdiff
|
tree
2012-02-10
J
u
n
io C Haman
o
M
erge branch 'da/maint-mergetool-twoway' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-09
Junio C
Ham
a
n
o
merg
e
: do not
l
aunch an
editor on "
-
-no-edit $t
a
g"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-09
Juni
o
C
Hama
n
o
ta
g
: do not sho
w
no
n
-
t
a
g content
s
with "-n"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-07
Junio C Haman
o
commit:
ignore int
e
nt-to
-
a
dd
ent
r
ies instead of r
e
fusing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-07
Junio
C
Hamano
git c
h
ec
k
out -
b
: allow
s
witchi
n
g out of an un
b
o
r
n b
r
anc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
J
u
ni
o
C Hamano
m
ailmap: a
l
ways return a plain mai
l
address from map_user()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Junio C Hamano
P
repare for
1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Juni
o
C Hama
n
o
Merge
branch '
s
p/smart-http
-
fai
l
ure
-
to-push' into maint
commit
|
commitdiff
|
tree
2012-02-06
Junio C Hamano
Merge branch 'jc/maint-log-
f
irst-parent
-
pathspec' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-02-06
Junio C Ha
m
a
n
o
Merg
e
branch
'cb/
p
u
s
h
-quiet
'
into
m
aint
commit
|
commitdiff
|
tree
2012-02-06
J
u
nio C Hamano
Merge br
a
nch 'cb/maint-kill-subprocess-u
p
on-signal
.
.
.
commit
|
commitdiff
|
tree
2012-02-06
J
u
n
io
C
Hamano
Sync with 1
.
7
.
6
.
6
commit
|
commitdiff
|
tree
2012-02-06
J
u
n
io C Haman
o
S
ync wit
h
1
.
7
.
6
.
6
commit
|
commitdiff
|
tree
2012-02-06
Ju
n
i
o
C Ha
m
ano
S
y
nc with
1
.
7
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
J
u
ni
o
C Ha
m
an
o
Git 1
.
7
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Junio C
H
a
mano
br
a
nch --edit-de
s
cription: prot
e
ct ag
a
inst mistyp
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Junio
C Hamano
me
r
ge: do n
o
t
c
r
eate
a
sig
n
ed tag merge under --ff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-04
J
unio C Hamano
p
a
rse_
d
ate(): '
@
' pr
e
f
ix
forces gi
t
-timestamp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-04
Junio C Hamano
parse_date():
allow an
c
ient git-ti
m
estamp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-04
Junio C Hamano
tests: a
d
d wri
t
e
_
scri
p
t helper f
u
nction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-01
Ju
n
io C Hama
n
o
r
e
q
uest-pull: exp
l
i
citly ask tags/$name to be pulled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-27
Jun
i
o C Hamano
G
i
t 1
.
7
.
9
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-27
Junio C Hamano
INSTALL: warn
ab
o
ut
r
ecent F
e
dora breaka
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-20
Junio
C
Hamano
Making path
s
pec limited log play
n
icer with -
-
first
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-18
Junio C Hamano
G
i
t
1
.
7
.
9
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-18
Juni
o
C
Ham
a
n
o
Merge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2012-01-18
J
un
i
o C Hamano
Git 1
.
7
.
8
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-18
Junio C H
a
m
a
no
Merge
branc
h
'
maint-1
.
7
.
7
'
into maint
commit
|
commitdiff
|
tree
2012-01-18
Junio C
Hamano
Git 1
.
7
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-18
Junio C Hamano
Merge b
r
anch 'jc
/
pull-signed-tag-doc
'
commit
|
commitdiff
|
tree
2012-01-18
Jun
i
o C Hama
n
o
pullin
g
s
igned tag: ad
d
h
o
wto document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-18
Junio
C
H
am
a
no
Me
r
ge branch 'jk/crede
n
tials'
commit
|
commitdiff
|
tree
2012-01-18
Junio C Hamano
Me
r
g
e
b
ranch
'nd/pat
h
sp
e
c-recursion-cleanu
p
'
commit
|
commitdiff
|
tree
2012-01-18
Junio C Ham
a
no
Merge bran
c
h '
m
h/
m
aint-show-
r
ef-do
c
'
commit
|
commitdiff
|
tree
2012-01-18
Jun
i
o C Hamano
M
e
rg
e
branch 'tr/
m
aint-word-dif
f
-
i
ncomplete-line
'
commit
|
commitdiff
|
tree
2012-01-17
Junio C
Haman
o
Merge bran
c
h 'jn
/
maint-gitweb-
g
rep-f
i
x'
commit
|
commitdiff
|
tree
2012-01-13
Junio C Ha
m
ano
Git 1
.
7
.
9-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-13
Junio C
Hamano
Merge branch 'jc/
r
eq
u
e
s
t-pull-show-head-4'
commit
|
commitdiff
|
tree
2012-01-13
Ju
n
i
o C Hamano
Merg
e
b
r
a
n
ch 'tr/maint-mailinfo'
commit
|
commitdiff
|
tree
2012-01-13
Junio C Haman
o
Merge b
r
anch 'ss/ma
i
nt-msys-cv
s
exportcommit'
commit
|
commitdiff
|
tree
2012-01-13
J
unio C Hama
n
o
M
e
rge branch 'jk/ma
i
nt-u
p
load-arc
h
i
v
e'
commit
|
commitdiff
|
tree
2012-01-13
J
u
nio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2012-01-13
J
u
nio C Hamano
Update draft release no
t
es t
o
1
.
7
.
8
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-13
Juni
o
C Hamano
Merge branch 'maint-1
.
7
.
7' into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-01-13
Junio
C Ha
m
ano
Up
d
ate draft release
notes to 1
.
7
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-13
Junio C Ham
a
no
Merge
branch 'ma
i
nt-1
.
7
.
6' into maint-1
.
7
.
7
commit
|
commitdiff
|
tree
2012-01-13
Junio C Hama
n
o
U
p
date
d
raft rele
a
se notes to
1
.
7
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-12
Ju
n
i
o C Ham
a
no
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2012-01-12
Junio C
Hamano
M
e
rge branch 'maint-1
.
7
.
7' into maint
commit
|
commitdiff
|
tree
2012-01-12
Junio C
H
ama
n
o
Merg
e
b
ranc
h
'maint-
1
.
7
.
6' into maint-1
.
7
.
7
commit
|
commitdiff
|
tree
2012-01-11
J
u
nio C Ham
a
no
r
eques
t
-pull: use the real fork point
wh
e
n
preparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-10
Junio C
H
am
a
no
Merge branch 'bw/maint-
t
8006-sed-incomple
t
e-l
i
ne'
commit
|
commitdiff
|
tree
2012-01-10
Ju
n
io C Ham
a
n
o
Sync with maint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-10
Junio C
H
amano
P
r
e
par
e
f
o
r
1
.
7
.
8
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-10
J
un
i
o C Hamano
Merge th
e
attributes f
i
x in from maint-1
.
6
.
7 br
a
nch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-10
J
unio C Haman
o
P
r
epare
f
or
1
.
7
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-10
J
u
ni
o
C
Hamano
Merge the attributes fix in f
r
om maint-1
.
6
.
6
b
ranch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-10
Junio C Hamano
Prepare for 1
.
7
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-10
Ju
n
i
o
C Hamano
Documenta
t
ion: rerere's
rr-cache auto-crea
t
ion and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-10
Junio C Hamano
attr
.
c: clarif
y
the logic to pop attr_stack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-10
J
uni
o
C Ham
a
no
attr
.
c: m
a
ke
b
o
o
t
strap_attr_stac
k
(
)
lea
v
e early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-09
Junio C H
a
mano
Merge bra
n
ch 'j
k
/credentials'
commit
|
commitdiff
|
tree
2012-01-09
Junio C
H
amano
Merge branch
'mh/ref-api-less
-
extra-refs'
commit
|
commitdiff
|
tree
2012-01-09
Junio C Haman
o
Me
r
ge bran
c
h 'mm/mai
n
t-
g
itweb
-
p
rojec
t
-maxdept
h
'
commit
|
commitdiff
|
tree
2012-01-09
J
u
nio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-01-08
Junio
C Hamano
serv
e
r_supports(): pa
r
se featur
e
list
m
ore car
e
ful
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-06
Junio C Hamano
Git 1
.
7
.
9
-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-06
Junio C Haman
o
Merge branch '
j
c/show-sig'
commit
|
commitdiff
|
tree
2012-01-06
Junio
C
Hamano
M
e
rge bra
n
ch 'jm/
s
t
a
s
h
-diff
-
d
i
sambig
u
a
t
e'
commit
|
commitdiff
|
tree
2012-01-06
Junio
C Ha
m
ano
Merge bran
c
h 'jh/fetch-he
a
d-update'
commit
|
commitdiff
|
tree
2012-01-06
J
unio C Hamano
Merg
e
branch 'pw/p4-vie
w
-updat
e
s'
commit
|
commitdiff
|
tree
2012-01-06
J
unio C Hamano
Sync
with 1
.
7
.
8
.
3
commit
|
commitdiff
|
tree
2012-01-06
Juni
o
C Hamano
Git 1
.
7
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-06
Junio C Hamano
Merge branch 'jn/maint-
g
it
w
eb
-
utf8-fix'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-01-06
Junio C
Hamano
Me
r
g
e
br
a
nch
'maint-1
.
7
.
7' into main
t
commit
|
commitdiff
|
tree
2012-01-06
Junio C
Hama
n
o
Merge
b
ranch
'm
a
int-1
.
7
.
6'
i
nto maint-1
.
7
.
7
commit
|
commitdiff
|
tree
2012-01-05
Jun
i
o C Hamano
l
og --show-signature: reword the common two-head
m
e
r
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-05
Jun
i
o C Hamano
log-tree: sho
w
m
erge
t
ag in
l
og -
-
s
h
ow-sig
n
atur
e
output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-05
Jun
i
o C
Ha
m
ano
log-tre
e
.
c
:
sma
l
l refactor in show_signature()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-05
J
unio
C
H
amano
comm
i
t
-
-amend -S:
strip existing gpgsig headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-05
Junio C Hamano
verify_sign
e
d_buffer
:
f
i
x stale comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-05
Junio C Hamano
Merg
e
br
a
nch 'jc
/
signe
d
-comm
i
t' and 'jc/pull-signed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-01-04
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-01-04
J
u
ni
o
C
Hamano
Merge branch 'nd/maint-pa
r
se-
d
epth' into maint
commit
|
commitdiff
|
tree
2012-01-03
Junio C Hamano
Mer
g
e
bran
c
h
'
pw/p4-docs-and-tests'
commit
|
commitdiff
|
tree
2012-01-03
Junio C
Hama
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2012-01-03
Junio C
Hamano
M
e
rge branch 'maint-1
.
7
.
7' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2012-01-03
Junio C Hamano
Merge
b
ranch 'maint-1
.
7
.
6' i
n
t
o
maint-1
.
7
.
7
commit
|
commitdiff
|
tree
2011-12-28
Junio C Hama
n
o
Updat
e
draft rele
a
se n
o
t
es to
1
.
7
.
9
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-28
Junio C Ham
a
n
o
Sync
with
1
.
7
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-28
J
unio C Hamano
G
i
t
1
.
7
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-28
Junio C Hamano
Merge branch 'jv/mai
n
t-config
-
set' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-12-28
Junio C Hamano
Merge branch 'jk/follow-
r
enam
e
-score
'
int
o
maint
commit
|
commitdiff
|
tree
2011-12-28
J
u
nio
C
Ham
a
no
M
erge
b
ran
c
h 'jc/checkout-
m
-twoway'
i
nto maint
commit
|
commitdiff
|
tree
next