repo.or.cz
/
git
/
jnareb-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 Haman
o
Merge bran
c
h
'
fc/c
o
mpletio
n
-z
s
h' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hama
n
o
Merge branch 'jk/git-connection-deadlock-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
i
o
C
H
a
m
a
n
o
M
er
g
e b
r
anch '
j
s/maint-send-pack-state
l
ess
-
rpc-dead
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
b
ranch 'svn
-
fe-maint' of
g
it://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Nguyen T
h
ai Ngoc Duy
i
n
i
t
/
clo
n
e:
r
emo
v
e short optio
n
-L and document --s
e
parate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Michael J G
r
uber
g
i
t
-svn: Fix git svn log --show-co
m
m
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Hamano
G
it 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
o
nathan Ni
e
d
e
r
provid
e
a copy
o
f the LGPLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jeff
K
ing
test core
.
gitpro
x
y configur
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Juni
o
C
H
amano
Merge bra
n
ch 'js/m
a
int-1
.
6
.
6-send-pa
c
k-stateless-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio
C Hamano
Update draft release notes t
o
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Haman
o
Merge branch 'jn/maint-
f
ormat-patch-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge bra
n
ch 'ss/
c
he
r
ry-pick-x
-
d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge
b
ranch 'vr/merge-bas
e
-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge branch 's
r
/maint-fast-import-
t
ighten-o
p
t
i
on
-
parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge branch 'jc/t15
0
6-shell-param-expans
i
on-gotch
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/fix
-
a
dd-u-un
m
erged' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Mer
g
e
branch 'jn/gitw
e
b-dependency' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge branc
h
'jc/maint-branch-mergeoptions' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
branch 'jc/maint-a
d
d-p-overlapping-
h
unks' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim
Meyering
Do
c
u
m
e
n
tation/git-f
s
ck
.
t
x
t: fix typ
o
:
unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
sen
d
-pack
:
a
v
oid de
a
d
lock o
n
git:// pu
s
h
with fa
i
l
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
o
n
n
e
c
t: le
t
c
a
llers know if connect
i
on
i
s
a socket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
K
ing
con
n
ect: treat
generic
proxy processe
s
like ssh p
r
ocesses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
sideba
n
d_demux(): fi
x
decl-after-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Upda
t
e
draf
t
re
l
ease notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
H
amano
Me
r
ge branch '
c
n
/
format-patch-
q
ui
e
t'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Mer
g
e branch '
j
m/merge
t
oo
l
-sub
m
odules'
i
nto
m
a
in
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
Merge branch 'jk/format-patch-quo
t
e-
s
peci
a
l-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge branch 'vh/git-
s
vn-doc'
i
n
t
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
git_op
e
n_noatime():
dro
p
unused pa
r
ameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
sha1_
f
i
le
:
typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add,
merge, diff: do
n
ot use strcas
e
cmp
t
o compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C H
a
mano
P
r
e
p
are f
o
r
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'aw/m
a
int-reba
s
e-i-p
-
no-
f
f' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
branch
'
js/blame-parsenam
e
' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
Merge branch 'gr/
c
vsimport-alter
n
ative
-
cvs
p
ass-
l
ocation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Me
r
ge bran
c
h 'cj/p4
m
erge'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-13
J
un
i
o
C
Ham
a
no
Merge bra
n
ch 'j
k
/me
r
g
e-one-file-wor
k
ing-tr
e
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge br
a
nc
h
'jc/fix-diff-files-unmerg
e
d' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
M
e
rge br
a
nch
'mz/maint
-
re
n
ame-u
n
merged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan
Herland
t5
4
00: Fix
a couple of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
F
e
li
p
e Contrer
a
s
git-
c
ompletio
n
:
fix regress
i
on
i
n zsh support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
H
am
a
no
t15
0
7:
a
v
oid "${paramet
e
r<op>'word
'
}"
i
nsi
d
e
d
ouble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Haman
o
t37
0
1: add-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
akub Narebski
R
e
mov
e
gi
t
w
eb/gitweb
.
cg
i
and other
l
egacy targ
e
ts from
.
.
.
Requested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jaku
b
Narebski
git
-
i
nstaweb: Sim
p
lify build
depend
e
n
c
y 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
merge:
m
ake branch
.
<name
>
.
mergeopt
i
ons correc
t
ly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João
Brit
t
o
Remo
v
e dupl
i
ca
t
e
d
"is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabbelier
f
a
s
t
-
import: f
i
x
option parser for no-arg o
p
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
J
unio C Ham
a
no
Mer
g
e
branch 'j
s
/maint-
1
.
6
.
6-send-p
a
ck-
s
tate
l
ess-
r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
J
e
ff King
send-pack: unbreak push over stateless rpc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Jun
i
o C Ha
m
a
n
o
t3701: fix here document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michae
l
J
G
r
u
ber
git-fa
s
t-import
.
t
x
t: -
-
relative-mark
s
takes
no pa
r
ameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
D
i
ma Sharov
shell: add missing initial
i
zation
o
f argv0_p
a
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t/annotate-tests: Use echo & cat in
s
tead of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
G
it
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch 'jh
/
di
r
sta
t
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C H
a
man
o
Mer
g
e branch 'sp/
m
a
i
n
t
-cl
e
ar-
p
o
stfields' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge bran
c
h
'
jk/main
t
-st
a
s
h-oob' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
H
amano
Mer
g
e branch 'jk/maint-uploa
d
-pack-s
h
allow' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o C
H
amano
Merge branc
h
'dm/stas
h
-k-i-p'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge branch 'jc/pack-objects
-
bi
g
file'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e
branch 'mg
/
r
e
flog
-
with-
o
ptions' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge b
r
anch 'jk/stas
h
-loosen-sa
f
ety'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'ar/
c
lean-rm
d
ir
-
empt
y
' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
H
am
a
no
Merge branch 'm
g
/sha
1
-path-advise' into maint
commit
|
commitdiff
|
tree
2011-05-04
V
a
l
entin Haenel
git-add
.
txt: d
o
cument
'
add
.
i
g
noreErrors'
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 empty fil
e
to p4merg
e
where no
b
ase is suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouill
i
er
Loo
k
for
p
as
s
word in
both CVS and
C
VSNT password files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-on
e
-
file: fix brok
e
n m
e
rges with alternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests for mer
g
e-index / merge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
i
o
C
Hamano
"add -p": w
o
r
k-around an old lazin
e
s
s
th
a
t does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
a
d
d--
i
nteractive
.
p
erl: factor out repeated --reco
u
nt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
t3701: E
d
i
t
i
n
g
a
split hunk in
a
n "add -p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C
Hamano
add -p:
'
q' s
h
ou
l
d r
e
ally quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
Start 1
.
7
.
5
.
1 mainten
a
nce
track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
unio
C Hamano
Merge branch
'm
g
/x-years-12-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Syl
v
ain Rabot
g
it-send-e
m
ai
l
:
fix m
i
ssing space in er
r
or message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
bl
a
me:
t
olerate b
o
gus e-mail addres
s
e
s
a bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andre
w
Wong
git-rebase--
i
ntera
c
ti
v
e
.
s
h: pr
e
serve-merges fai
l
s
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jeff
Ki
n
g
pr
e
tty: qu
o
te rfc
8
22 specials in email addr
e
sses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
ti
n
Haenel
git-sv
n
.
tx
t
: small type
f
ace
impr
o
vem
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
ntin Haenel
git-svn
.
txt: move option descriptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valent
i
n
Haenel
git-svn
.
txt: fi
x
usage of --add-author-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Ham
a
no
http: clear POSTFIELDS w
h
en in
i
ti
a
lizing a s
l
ot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
Junio
C Haman
o
Merge branch 'js/m
a
int-1
.
6
.
6-send-pack-st
a
t
eless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johannes Sixt
send-pack: avo
i
d d
e
adlock w
h
en
pack-o
b
ject dies
e
arly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hamano
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C H
a
mano
F
i
x "add -u
"
that sometimes fails to
reso
l
ve unmer
g
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff-fi
l
es:
show unmerged
e
ntries correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C
H
amano
dif
f
:
r
emove often unu
s
ed
p
a
r
a
meters fro
m
diff_un
m
erge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C
H
ama
n
o
diff
.
c: re
t
ur
n
fil
e
pair from
diff_u
n
m
e
r
ge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
amano
test: use $_z40 f
r
om tes
t
-
l
ib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael
J
Gruber
d
ate
:
avoid "X year
s
, 12 m
o
nths
"
i
n re
l
ative da
t
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hama
n
o
Git 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
ni
o
C Hama
n
o
S
y
n
c
with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hama
n
o
Git
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
git-svn
.
tx
t
:
Docum
e
nt --mergeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Ju
n
io
C
Hamano
Revert
"
r
u
n-command: prettify -D_F
O
RTIFY_SO
U
RCE workaround"
commit
|
commitdiff
|
tree
next