repo.or.cz
/
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 'jk/cherry-pick-root-with-resolve' into maint
2011-05-26
Ju
n
io C Hamano
Merge br
a
nc
h
'jk/cherry-pick-root-with-resolve'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge br
a
nch
'
rg/copy-gecos-user
n
ame' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge b
r
a
n
ch 'fc/
c
o
m
p
letion-zsh' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Merg
e
bra
n
ch 'jk
/
git-connectio
n
-
d
eadloc
k
-
f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Haman
o
Me
r
g
e
b
r
anch
'js/mai
n
t-send
-
pack-state
l
e
ss-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
i
o C Haman
o
M
e
rge
b
r
anch '
s
v
n
-fe-ma
i
nt' of git://repo
.
or
.
cz/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Ng
u
yen Thai Ngoc Duy
init/clone: remove short opti
o
n -L an
d
doc
u
ment -
-
separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gruber
git-
s
vn: F
i
x git svn
log --show-commi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Git
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nieder
pr
o
vide a copy of
the L
G
PLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff Kin
g
t
e
st core
.
g
it
p
roxy c
o
nfi
g
urat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Rafael Gieschke
copy_gecos:
f
ix not
adding nlen to len whe
n
p
r
o
c
essing
"
&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Jun
i
o C Hamano
Merge
b
r
anc
h
'
js/maint-1
.
6
.
6-s
e
nd-pack-stateles
s
-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o
C
Hamano
Update
d
raft re
l
ease notes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
M
e
rge branch
'j
n
/maint-form
a
t-patch-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merg
e
branch 'ss/
c
herry-pic
k
-x-do
c
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge
bran
c
h 'vr/merge-b
a
se
-
doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio
C
Hama
n
o
M
erge branch 'sr/
m
aint
-
f
a
st
-
import
-
tighten-option-pa
r
si
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
am
a
no
Me
r
ge
br
a
nch 'jc/t1506-shell-param-expansion-gotc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
mano
Mer
g
e branch 'jc/fix-
a
d
d
-u-unmerged' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jn/git
w
eb-dependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge branch 'jc/maint-branch
-
mergeoptions' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
er
g
e bran
c
h
'
jc
/
m
a
int-add-p
-
overlap
p
ing
-
hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyerin
g
Docum
e
nt
a
ti
o
n/gi
t
-fsc
k
.
t
x
t: fix
typo
:
unre
a
d
a
bl
e
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
sen
d
-
p
ack: avoid dead
l
ock on git://
push with failed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
co
n
ne
c
t: l
e
t
c
allers know
i
f
connecti
o
n
i
s a socket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f King
connect:
treat
gen
e
ric proxy pr
o
cesses lik
e
s
sh processes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
sideband_
d
emux(): fix decl-afte
r
-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f
K
i
n
g
t3503:
test cherry picking and reverting ro
o
t
commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
K
i
ng
reve
r
t: allow reverting a root c
o
mmit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
cherry-pick: ha
n
dle root commits
with extern
a
l strat
e
gies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Upda
t
e dra
f
t release
n
o
tes
to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge branch 'cn/format
-
patch-quiet' into
ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge
branch
'j
m
/mergetool-submodules' into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge
b
r
anch 'jk/
f
ormat-patch-qu
o
te-special-in-f
r
om
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'v
h
/git-svn-doc' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
git_open_n
o
atime(): drop unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
sha
1
_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
on
a
t
ha
n
Niede
r
add,
merge,
d
i
ff:
d
o
n
ot use str
c
a
s
ecmp to compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
P
r
epare for
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bra
n
ch
'
aw/maint-rebase-
i
-p-no-ff'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ha
m
a
n
o
M
e
rge branch 'j
s
/blame-parse
n
ame' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C H
a
mano
Merge bran
c
h 'gr/cvsi
m
po
r
t
-alterna
t
ive-cvsp
a
ss-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge branch 'cj/p4merge' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C Hamano
Merg
e
branch 'jk/m
e
rge-one-file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge branc
h
'
j
c
/
fix-dif
f
-fil
e
s-unme
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge br
a
nch 'mz/
m
aint-rename-unmerged' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Johan Herl
a
nd
t540
0
: Fix
a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Fe
l
ipe
Con
t
reras
git-c
o
m
p
le
t
i
o
n
: fi
x
reg
r
ession in zsh
s
uppor
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C H
a
mano
t1507:
a
void "${parameter
<
op>'word'}" inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C H
a
mano
t3
7
0
1
: add-p-fix makes t
h
e last test t
o
pas
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub N
a
rebski
Remove gi
t
web/gitwe
b
.
cgi an
d
other legac
y
targets from
.
.
.
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
ki
git-insta
w
eb
:
Simplify buil
d
dependency
o
n 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: make
b
r
anc
h
.
<
n
a
m
e>
.
mergeoptions correctly
override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João
B
rit
t
o
R
emo
v
e
d
u
plicat
e
d
"
i
s a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabbel
i
er
fast-import: fix option parser fo
r
no
-
arg o
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io C Hamano
Mer
g
e branch 'js/main
t
-1
.
6
.
6
-
send-pack-s
t
at
e
less-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
J
e
ff King
send-pa
c
k: unbreak push
o
ver
stateless r
p
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ha
m
a
no
t3
7
01: fix
here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gru
b
er
g
it-fast-import
.
tx
t
:
--re
l
ati
v
e-mark
s
t
a
k
e
s no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Di
m
a Sha
r
o
v
s
hell: add missing init
i
alization
of a
r
gv
0
_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Ger
n
hardt
t/
a
nnota
t
e
-
tes
t
s: Use echo &
cat
instead
o
f
sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C
Ha
m
ano
Git
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
C Hama
n
o
M
erge b
r
anch
'jh/dirstat
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge branch 'sp/mai
n
t-clear
-
postfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
a
n
o
Merge branch 'jk
/
ma
i
nt-stash-oob' int
o
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
am
a
n
o
Merge
branch 'jk/maint-upload
-
p
ack-sh
a
ll
o
w' into
m
ain
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
M
e
rge branch 'dm
/
s
tash-k-i-p' i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
C Hamano
Merge branch 'jc/pack-objects-bigfile
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
n
ch 'mg/r
e
flog-with-options' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ham
a
no
Merge branc
h
'jk/s
t
ash-l
o
osen-safety' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C H
a
mano
Me
r
ge bran
c
h 'ar/clean-rmdir-empt
y
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
r
anch 'mg/sha1-
p
ath-advise' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Valenti
n
H
aenel
gi
t
-add
.
txt:
document
'
a
d
d
.
ignoreErrors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jess
u
p
Pa
s
s empty file to
p
4
m
erge where no
b
a
s
e is sui
t
ab
l
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy
R
ou
i
llier
Look for password in both CVS and
C
V
S
NT pa
s
sword files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-file: fix broken
merges with
a
lternate wo
r
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Je
f
f King
add tests fo
r
merge-ind
e
x
/ merge-one
-
f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio
C
Ha
m
ano
"add -p"
:
work-around an
o
l
d l
a
zi
n
ess tha
t
d
o
e
s not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hamano
add--
i
nteractive
.
perl:
factor
o
u
t
r
epeated --r
e
count
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C H
a
mano
t3701: Editing a split
h
unk in an "add
-
p" s
e
ssion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
add -p: 'q' should reall
y
quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
Start 1
.
7
.
5
.
1 maintenance tr
a
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
mano
M
e
rge branch
'mg/x-ye
a
rs-12-
m
onths' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain
R
abot
git-send-email
:
fix missin
g
space in err
o
r messag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
o
sh
Stone
blame: tole
r
ate bogus e-mail addresses a bit be
t
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
g
it-rebase--inte
r
active
.
sh: p
r
eserve-m
e
rges fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
eff
K
in
g
pretty
:
quote r
f
c822 specia
l
s in
e
m
a
il addres
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haene
l
g
i
t
-svn
.
txt:
small type
f
a
ce improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Hae
n
el
git-svn
.
t
x
t: move
o
ption descriptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
tin Haen
e
l
gi
t
-
s
vn
.
txt: fi
x
u
sage of --ad
d
-a
u
thor-fr
o
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
u
nio C Hamano
http: cl
e
ar POSTF
I
E
L
DS when in
i
tiali
z
i
n
g
a
s
l
ot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Ju
n
i
o C Hama
n
o
Me
r
ge bra
n
c
h 'js/maint-1
.
6
.
6-send-pa
c
k-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Jo
h
annes Sixt
send-pack: avoid deadlock when pack
-
ob
j
ect di
e
s ea
r
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C
Hamano
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" that somet
i
mes
f
ails to resolve
u
nmerge
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hamano
d
i
ff-fil
e
s:
sho
w
u
nm
e
rged entri
e
s corr
e
ctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
H
a
mano
diff: remo
v
e often
u
nused parameters f
r
om diff_unme
r
g
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
mano
d
i
f
f
.
c: r
e
t
urn
fil
e
pair from diff_
u
nmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
test: u
s
e $_
z
40
f
rom te
s
t-l
i
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next