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 'fc/completion-zsh' into maint
2011-05-26
Junio C Hamano
Merge branch 'fc/co
m
pletion-zsh' into
maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Haman
o
Merg
e
b
ra
n
ch
'jk/
g
it-con
n
ection-deadl
o
c
k-f
i
x' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
io C Hamano
M
erg
e
b
r
anch '
j
s
/
m
a
int-send-p
a
ck-stateless-rpc-de
a
dlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
branch 'svn
-
fe-maint' of git://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
N
g
uyen Thai Ngoc
D
uy
i
nit/clone:
r
emove s
h
o
r
t
o
p
tion -L and document --s
e
p
a
rate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Mic
h
a
e
l J Gruber
g
i
t-svn: F
i
x git svn log --show-commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
Gi
t
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nieder
pr
o
vid
e
a
copy of the LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test c
o
re
.
gitp
r
o
xy configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Juni
o
C Hamano
Mer
g
e branch 'js
/
m
a
int-1
.
6
.
6-send-pack
-
st
a
teless-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update draft release notes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
M
erge branch
'jn/maint-format-pat
c
h-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ham
a
no
Merge
branch 'ss/cherry-pick-x-doc' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch
'
vr/merge-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
n
o
Merge branch 'sr/maint-
f
ast-import-tigh
t
en-opt
i
on
-
parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branc
h
'jc/t1506-s
h
ell-pa
r
am-
e
x
pansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Me
r
ge branch 'jc/fix-add-u-un
m
erged' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
aman
o
Merge branch
'jn
/
gitweb-d
e
pendency' into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C H
a
man
o
M
erge branch
'
jc/maint-branch-mergeoptions' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge branch 'jc/maint-add-p-overlapping
-
hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
D
o
cumentatio
n
/git-fs
c
k
.
txt: fix typo: unr
e
a
d
able
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
se
n
d
-
p
ack: avoid deadlock
on git:// push with fai
l
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
con
n
ect: let calle
r
s know if
connection is a socket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
f
f
King
c
o
nnect:
treat generic proxy p
r
ocesses lik
e
ssh proce
s
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
sideband
_
demux():
fix decl-after-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C
H
am
a
no
Update draft r
e
lease notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Merge b
r
a
n
ch 'cn/form
a
t
-patch-quiet'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge
b
ranc
h
'jm/mergeto
o
l-su
b
modules' int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Ham
a
no
Mer
g
e branch 'jk/f
o
rmat-patch
-
quote-special-in
-
f
rom
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge br
a
n
ch '
v
h
/
git
-
svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
git_open_noa
t
ime(): drop unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C H
a
mano
sha
1
_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonatha
n
Nie
d
er
add, merge,
di
f
f: do not use strca
s
ecmp to co
m
pa
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch 'aw/maint-rebase
-
i
-p-no-ff'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C
Ha
m
ano
Merge b
r
a
nc
h
'js/blame-
p
arsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merg
e
bran
c
h
'
gr/c
v
simpo
r
t-a
l
ternative-cvs
p
a
ss-
l
o
c
ation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o C H
a
m
a
no
Merge
branch 'cj
/
p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'
jk/merge-one-file-
w
ork
i
ng-tree'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge b
r
anch 'jc/fix-diff-files-unm
e
rged' in
t
o main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Haman
o
Merge branc
h
'
mz/mai
n
t-ren
a
me-unmerg
e
d' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
e
r
land
t5400: Fix a
c
ouple of typ
o
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Felipe Contreras
git-completion:
f
ix regres
s
ion in zsh
support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o C
H
amano
t1507: avoid "${p
a
ramet
e
r<op>'wor
d
'}" inside
double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701: a
d
d
-p-f
i
x makes the last
test to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
a
kub
Na
r
ebsk
i
R
e
m
ove
g
itweb/
g
itwe
b
.
cgi and other legacy ta
r
gets from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
a
kub N
a
rebski
git
-
instaw
e
b
:
Simplify build dependen
c
y on
gi
t
we
b
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
mano
merge: make branch
.
<na
m
e>
.
m
ergeopt
i
ons
correc
t
ly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João
Britt
o
Remov
e
duplicated
"is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre
R
abbeli
e
r
fast-i
m
port: fix opti
o
n
pa
r
s
e
r
for n
o
-arg options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Merg
e
br
a
nc
h
'js
/
maint-
1
.
6
.
6
-
se
n
d-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jef
f
King
send-pa
c
k
: unbreak push
over
st
a
teless rpc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C Hamano
t3701
:
fix here d
o
cument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Mic
h
ael
J
Gruber
g
i
t-fast-import
.
txt: --rela
t
ive-marks
takes no para
m
eter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
h
ell: ad
d
missi
n
g ini
t
i
a
l
ization of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
B
r
ian Gernhardt
t/ann
o
tate-
t
ests
:
Use e
c
h
o & ca
t
i
nstead
of
sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Ha
m
ano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
ma
n
o
Me
r
ge branch 'jh/dirstat' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branch 'sp/maint-clear-po
s
t
fields' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
ni
o
C Hamano
Merge branch 'jk/m
a
int-stash-oob'
in
t
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
M
er
g
e
bra
n
ch
'jk/maint-upload-pack-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
branch 'dm/s
t
ash-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
ano
Merg
e
bran
c
h '
j
c/
p
ack-objects-bigfile'
i
nto
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
Hamano
Merge branch 'mg/reflog-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge
branch 'jk/
s
ta
s
h
-loos
e
n-s
a
fety'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Mer
g
e
b
ranch 'ar/
c
lean-rmdir-empty
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branch
'
mg/sha1-path-advise' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Ha
e
nel
gi
t
-add
.
tx
t
:
document 'a
d
d
.
ig
n
oreE
r
rors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciara
n
J
e
ssup
Pas
s
empty file
t
o p4mer
g
e where
n
o
base
i
s suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Ro
u
i
l
l
i
e
r
Look for password in both CVS and
C
VSNT password fil
e
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-file:
fix bro
k
en mer
g
es with alternate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add te
s
ts for merge-index
/
m
erge
-
one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C
H
amano
"
add -p"
:
w
ork-a
r
o
u
nd
a
n old lazi
n
ess th
a
t does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add-
-
i
n
t
e
ractive
.
perl: factor out
repeated -
-
recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3701: Editing a split hunk in a
n
"ad
d
-p
"
s
e
ssion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
a
n
o
add -p:
'
q' should really quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
Start 1
.
7
.
5
.
1 mai
n
tena
n
ce track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Ham
a
no
Merge bran
c
h '
m
g/x-yea
r
s-12-mont
h
s' i
n
to main
t
commit
|
commitdiff
|
tree
2011-04-29
Sylvai
n
R
abot
gi
t
-send-email: fix missing space
i
n error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh
Stone
blame: tol
e
rate bogus e
-
mail addresses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andre
w
Wong
git-rebase-
-
i
n
t
eractive
.
sh: preserve
-
merges fails
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff Kin
g
pr
e
tty: quote rfc
8
2
2
spe
c
i
a
l
s
in e
m
a
i
l
addresse
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
tin
Haenel
git-svn
.
txt: sm
a
ll t
y
peface improveme
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin
Haene
l
g
i
t
-
svn
.
tx
t
: move
o
ption descriptio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
a
le
n
tin Haenel
git-svn
.
txt:
fi
x
u
s
age of
--add-author-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio C
H
a
man
o
http: clear POSTFIELDS when
i
nitial
i
zing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio C
H
amano
Merg
e
branch 'js/m
a
i
n
t
-1
.
6
.
6-send-pack-state
l
ess-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johan
n
e
s
S
i
xt
send-pack: avoid deadlock when pack-object die
s
early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
am
a
no
Git
1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Ham
a
n
o
F
ix
"
ad
d
-
u
"
that sometime
s
f
a
ils
to resolv
e
u
n
me
r
ged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
d
iff-
f
il
e
s: show
u
nmerged entries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
n
io C
Hamano
diff: r
e
m
o
ve
o
ften unused parameters from
d
i
ff_
u
n
m
erge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
uni
o
C
Hamano
diff
.
c: return filep
a
ir
f
rom d
i
ff_unmerge(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
test: use $_z40
from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
date:
avoid "X years, 12 months" in re
l
ative da
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
Hamano
G
it 1
.
7
.
5-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Haman
o
Sy
n
c
with
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
unio C Hama
n
o
G
i
t
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
M
i
chael J Gruber
git-svn
.
txt
:
Document --m
e
rgeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C
H
amano
Revert
"r
u
n-co
m
m
a
nd: p
r
et
t
ify -
D
_FO
R
TIFY_SOURCE
wor
k
around"
commit
|
commitdiff
|
tree
next