repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maint
2011-05-26
Junio C Hamano
Merge bran
c
h
'jc/maint-pat
h
spe
c
-stdin-and-cmdl
i
ne'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C
Hamano
M
e
rge branch 'jk
/
cherry-
p
ick-ro
o
t-wi
t
h-re
s
olve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
an
o
M
e
rge
branch 'rg/co
p
y-gecos-
u
sername' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
M
erge
b
ranch 'f
c
/com
p
letion-zsh' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C
Haman
o
Merge br
a
n
ch 'jk/g
i
t-connectio
n
-dea
d
lock
-
fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Mer
g
e branch
'
js/maint-send-pack-stateless-rpc
-
dead
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merge bra
n
ch 'svn-fe-m
a
int' of g
i
t:
/
/repo
.
o
r
.
cz
/
gi
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Nguy
e
n Thai N
g
oc
Duy
ini
t
/clo
n
e:
r
emove s
h
ort
o
p
t
i
on -L a
n
d document
--separat
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Michael J G
r
uber
git-svn: Fix git s
v
n lo
g
-
-
show-commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
unio
C
Hamano
Git
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jonath
a
n Nieder
p
r
o
v
ide a co
p
y of the
L
G
PLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jeff
King
test core
.
gitproxy
config
u
r
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Rafael Gieschke
copy_gecos: fi
x
n
o
t addi
n
g nlen to len when
pro
c
essing "&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
J
u
n
io C Hamano
M
e
r
g
e br
a
nch 'js/
m
a
i
n
t-1
.
6
.
6-send-p
a
ck-stat
e
less-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Update
d
raft release notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch '
j
n/main
t
-for
m
at-pa
t
ch-doc'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C Ha
m
ano
M
e
rge
bran
c
h 'ss/cherr
y
-pick-
x
-doc
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch 'vr/merge-base-doc' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branc
h
's
r
/maint-fast-i
m
port-tighten-opti
o
n-pa
r
sing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
r
ge bra
n
ch
'jc/t1506-she
l
l-par
a
m-expa
n
sion
-
gotch
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Me
r
g
e branch 'jc
/
fix
-
add
-
u-unme
r
g
e
d' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge branch
'jn/gitweb-dependency' in
t
o main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e branc
h
'
j
c/maint-bran
c
h-mer
g
eop
t
ions
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge branch 'jc/maint-add-p-overlapping-hun
k
s
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
im Meyeri
n
g
Documen
t
ation/git-fsck
.
txt:
f
ix typo: unre
a
dab
l
e
-
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
e
f
f
King
send-p
a
ck
:
avoid d
e
adl
o
ck on git:// push with failed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f K
i
n
g
conn
e
ct: let callers kno
w
if connecti
o
n is a socket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
connect
:
treat generic proxy processes like ssh
p
roce
s
ses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
sideba
n
d_de
m
ux(): fix d
e
cl-after-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t
3
503
:
test cherry
pick
i
ng
a
nd reverting r
o
ot commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
r
e
v
e
r
t
: allow reverting
a root commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
e
f
f Ki
n
g
cherr
y
-pick: han
d
le roo
t
commi
t
s wi
t
h extern
a
l strategi
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Update draf
t
release notes
to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Merge br
a
n
c
h 'cn/
f
ormat-p
a
tch-quiet' into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Ham
a
no
Merge branch
'
jm/mergeto
o
l-submodules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
H
am
a
n
o
Merge branch 'jk/f
o
rmat-patch-
q
u
ote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
a
mano
M
erge br
a
nc
h
'vh/gi
t
-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_open_noatime(): drop
u
nuse
d
parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_fi
l
e: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonath
a
n Ni
e
d
e
r
add,
m
erge
,
diff: do
n
ot use st
r
casec
m
p to compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Pr
e
p
a
r
e
for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge b
r
anch 'aw/ma
i
nt-rebase-i-p-
n
o-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C
H
am
a
no
Merge branch 'js/blame-parsename'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge branch
'
gr/c
v
s
i
mpo
r
t-al
t
ern
a
tive-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge branch 'cj/p4merge'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
n
o
Mer
g
e b
r
anch 'jk/merge-one-file-working-
t
ree'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e
branch '
j
c/fix-d
i
ff-files-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
r
ge bran
c
h 'mz/maint-rename
-
u
nmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan
Herla
n
d
t540
0
: Fix a couple of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch
'jc/
m
aint-1
.
7
.
4-
p
athspec-std
i
n-and-cmd
l
in
e
'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hama
n
o
Me
r
ge b
r
anch 'jc/maint-1
.
6
.
6
-
pathspec-
s
tdi
n
-and-cmdline
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
setup_revisions(): take pathspec fro
m
c
ommand line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Felipe C
o
ntre
r
as
git-completion: fix
r
e
gression
i
n
z
sh
suppor
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
i
o C Hamano
t
1
507
:
av
o
id
"${parameter<op>
'
word'}" inside do
u
ble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
uni
o
C Hamano
t3701: ad
d
-
p-fix makes
t
he last test
to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Nareb
s
k
i
Rem
o
v
e
git
w
eb/gitweb
.
cgi and othe
r
legacy ta
r
gets
f
rom
.
.
.
Requested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Nareb
s
k
i
git
-
instawe
b
:
S
implif
y
build dependency on
gitweb
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 Hamano
m
e
rge: make
b
ranch
.
<name>
.
mergeoptions correctly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João
B
ritto
Remov
e
dup
l
icat
e
d "is
a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
S
verre Rab
b
e
lier
f
a
st
-
imp
o
r
t: fix
option pa
r
ser for no-arg o
p
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C H
a
mano
Merge branch 'js/m
a
int-1
.
6
.
6-se
n
d-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff Kin
g
send-pac
k
: u
n
break push over sta
t
eless
rpc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hama
n
o
t
3701: f
i
x here docu
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael J
Grub
e
r
git-fast-import
.
txt: --relative-
m
arks
t
akes no parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Di
m
a Sharov
shell
:
a
d
d
m
issing initi
a
lization of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhard
t
t/
a
nnotate-t
e
s
t
s:
U
se e
c
ho & cat inste
a
d of
sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
a
no
Merge branch 'jh/dirstat' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
M
erge branch 'sp/maint-clear-
p
ostfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge bra
n
ch 'jk/maint-stash
-
oob' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-upload
-
pack-shallow' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bran
c
h 'd
m
/stas
h
-k-
i
-p' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge branch 'jc
/
pack-objects-bigfile' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o
C Hamano
M
erge
b
ranch 'mg/reflog-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
M
erge bra
n
c
h
'jk/stash-loosen-saf
e
ty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
br
a
nc
h
'a
r
/clean-
r
md
i
r-emp
t
y' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C
Hamano
M
e
rg
e
bran
c
h 'mg/sh
a
1-path-ad
v
ise' into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
git-add
.
txt: document 'add
.
i
gnoreErrors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jessup
Pass
e
mpty fil
e
to p
4
merge whe
r
e no bas
e
i
s
suita
b
le
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
L
ook f
o
r password
i
n both CVS a
n
d CVS
N
T
passw
o
rd files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
eff
King
merge-o
n
e-file: fix broken
merge
s
with alternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
e
ff K
i
ng
a
dd t
e
sts f
o
r me
r
g
e
-in
d
ex
/
merge-
o
ne-f
i
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hamano
"add -p": w
o
rk-around an old laziness that does n
o
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add--interactive
.
p
e
r
l: fa
c
tor o
u
t repeated --
r
ecount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
ni
o
C Hamano
t3
7
01: Editing
a
s
p
l
it hunk i
n
an "add -p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
i
o C Hama
n
o
add -p: 'q' sho
u
ld really qu
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
St
a
rt 1
.
7
.
5
.
1 maintenanc
e
track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C
H
amano
M
erge branch '
m
g
/x-years-12-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain
Rab
o
t
g
it-send-email: fix missing
s
pace in error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
b
lame: tolera
t
e
b
ogus
e-mai
l
addresse
s
a
bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew
W
ong
git
-
rebase
-
-interactive
.
sh: preserve
-
merges fails on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Je
f
f Ki
n
g
pretty: qu
o
te rfc
8
22 speci
a
ls in
e
m
ail a
d
dresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in
H
aenel
git-svn
.
tx
t
:
s
m
all typefa
c
e improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Ha
e
nel
git-svn
.
txt: move option descriptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valenti
n
Ha
e
ne
l
git-svn
.
t
x
t
: fix
us
a
ge of --
a
dd-a
u
thor-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Hamano
http: cle
a
r
POSTFIE
L
DS
w
hen initializi
n
g a slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
Ju
n
io C Ham
a
no
Mer
g
e br
a
nch 'js/maint-1
.
6
.
6-send-
p
ack-st
a
teless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johannes Si
x
t
s
end-pack: avoi
d
d
eadlo
c
k wh
e
n pack-object dies ear
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fix "add -u" t
h
at sometimes fail
s
t
o
resolve un
m
erged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next