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 'svn-fe-maint' of git://repo.or.cz/git/jrn into maint
2011-05-26
Junio C Hamano
Merge b
r
anch 'svn-fe-maint' of git://r
e
po
.
o
r
.
cz/gi
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Nguyen
T
hai Ngoc Duy
init/clone: remove short optio
n
-L a
n
d docum
e
nt --sep
a
rat
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
M
i
cha
e
l J
Gruber
g
i
t-s
v
n
:
Fix git
svn l
o
g --show-commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Hama
n
o
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nieder
prov
i
de
a copy of t
h
e LGPLv
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Update
d
raft
r
elease not
e
s
to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
M
e
rge
b
ran
c
h 'jn/mai
n
t-
f
orm
a
t-pa
t
ch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C Ha
m
ano
Mer
g
e bra
n
ch 'ss/cherry-pick-x-do
c
' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
Hamano
Merge
b
ranch 'vr
/
merge-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge b
r
a
nc
h
'
s
r/ma
i
nt-fast-
i
mport-tighten-option-pa
r
sing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merg
e
bran
c
h
'
jc/t1506-shell-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
ama
n
o
Merge branch 'jc/fix-add-u
-
u
n
merged'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hama
n
o
M
erge branc
h
'jn/g
i
t
w
eb-depende
n
cy' into maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merge branch 'jc/m
a
int-branc
h
-me
r
geopti
o
n
s' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/m
a
int-add
-
p
-
overlapping-hunks'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Documentation/git-fsck
.
t
xt: fix typo: un
r
e
adable
-
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Update draft releas
e
notes to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
m
a
no
M
e
r
ge
b
ranch 'cn
/
form
a
t-
p
a
t
ch-quiet'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Merge branch 'jm
/
mergetool-submod
u
les' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
J
un
i
o C H
a
mano
M
erge
b
ranch 'jk/for
m
at-p
a
tch-quote-special-in-fro
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
Merge branch 'vh/
g
it
-
svn-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_open_no
a
t
ime():
dr
o
p unu
s
ed parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
sha1_
f
ile: typofi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jon
a
than
N
i
eder
a
d
d, merge, diff: do n
o
t u
s
e strcasecmp to compa
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Prepare 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
b
ranch
'aw/ma
i
nt-rebase
-
i-p-
n
o-ff' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merg
e
branc
h
'js/blame-parsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
g
e branch 'gr/cvsimport-al
t
ernati
v
e-cvsp
a
ss-locatio
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Me
r
ge
bra
n
ch 'cj/p
4
merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge branch 'jk/merge-one-file-wo
r
k
i
ng-tree'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/fix
-
diff-files-un
m
erg
e
d'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Me
r
ge br
a
nch 'mz/maint-rename-u
n
merged' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-13
Johan He
r
land
t5400: Fix a coupl
e
of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o C Hamano
t150
7
:
avoid "${p
a
rameter<o
p
>'word'}
"
insi
d
e doub
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Juni
o
C Hamano
t3701:
add-p-fix makes the last test to
p
ass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Nare
b
s
k
i
Re
m
ove gitweb/git
w
eb
.
cgi and other
l
egacy targets f
r
o
m
.
.
.
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
Na
r
ebski
git-instaweb: S
i
mplify build
de
p
endency
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:
make branch
.
<name
>
.
mergeoption
s
correctly over
r
ide
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João
B
r
i
tto
Remov
e
d
uplicated
"is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
S
ve
r
r
e
Rabbelier
fas
t
-import: fix opti
o
n parser for no-arg options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C Hamano
t3701: fi
x
her
e
document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mich
a
el J Gruber
git
-
f
a
st-impo
r
t
.
txt: --relative-marks takes no par
a
meter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
she
l
l: add m
i
ssing initialization o
f
arg
v
0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Ge
r
nhardt
t/annotate
-
t
e
s
ts: Use echo & ca
t
instead 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 Hamano
Merge branch
'
jh/dir
s
t
at' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge branch
'
sp/maint
-
clear-p
o
stfield
s
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C H
a
mano
M
e
rg
e
b
r
anch 'jk/maint-stash
-
oob' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
nc
h
'jk/maint
-
upload-
p
a
c
k-shal
l
ow' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge
b
r
anch
'
dm/stas
h
-k-i-p' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Ham
a
no
Merg
e
br
a
n
ch 'jc/pack-o
b
jects-bigfile'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
M
erg
e
bra
n
ch
'
m
g
/
r
eflog-with-options
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge branch
'
j
k
/
stash-loose
n
-sa
f
ety' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge bra
n
ch
'
ar/clean-rmdir-empty'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o C Hamano
Merge br
a
nch 'm
g
/sha1-path
-
ad
v
ise' into maint
commit
|
commitdiff
|
tree
2011-05-04
V
a
lentin H
a
enel
git-add
.
tx
t
:
document 'add
.
ignoreEr
r
or
s
'
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
P
a
s
s
empty file to p4me
r
ge whe
r
e no
base is suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillie
r
Lo
o
k
f
or password in b
o
th CVS
and CVSN
T
p
a
ssword files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
mer
g
e-one-file: fix broken merges wi
t
h
a
lternat
e
w
ork
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Kin
g
add t
e
sts for merge-ind
e
x / mer
g
e-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
H
amano
"add -p":
w
ork-arou
n
d an old laziness
th
a
t do
e
s not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C H
a
ma
n
o
add--interactive
.
perl:
f
actor out
repeated --
r
e
cou
n
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
mano
t370
1
: Editing a split
h
u
n
k in
a
n "add -p" sessi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
ad
d
-p
:
'q' sh
o
uld really quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
Start 1
.
7
.
5
.
1
maintenance
t
r
ack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
M
e
rge branch 'mg/x-year
s
-
1
2-mon
t
h
s' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-s
e
n
d-emai
l
: fi
x
missing space in
e
r
r
or messa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
sh St
o
ne
blame: to
l
erate bogus e-m
a
il
a
ddresses 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
Jeff King
pr
e
t
t
y: quote rfc822 specials
i
n email
a
ddresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt: small type
f
ace impr
o
vements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
g
it
-
svn
.
t
x
t: move opti
o
n
descrip
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Va
l
ent
i
n
H
aenel
git-svn
.
txt: fix usage of --add-author-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
J
u
nio C
H
amano
http: clear
POSTFIELDS when initializing a slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hama
n
o
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Ham
a
no
F
i
x
"add -u" th
a
t sometimes fails t
o
reso
l
ve unmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
i
o C H
a
mano
dif
f
-
f
ile
s
: show unmerged entries
c
orrectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
amano
d
i
ff: remove of
t
en unused parameters from
diff_u
n
me
r
ge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
diff
.
c: return
f
i
l
epair from diff_unmerge
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Ha
m
ano
t
est: use $_z40 from t
e
st-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael
J
G
rub
e
r
da
t
e: avoid "X years, 12 months" in relati
v
e
dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
un
i
o C Ha
m
ano
Git 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio C Hamano
S
y
nc with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio C H
a
m
ano
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
g
i
t-svn
.
tx
t
: Document --me
r
ge
i
nfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
R
evert "ru
n
-c
o
mmand: prettify -D_FORTIFY
_
SOURCE wor
k
around"
commit
|
commitdiff
|
tree
2011-04-15
Sebastian Schub
e
rth
doc: Clari
f
y that "ch
e
rry-pick -x"
does not
use "git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan
Nieder
Docume
n
t
a
t
i
on: de
s
cri
b
e the for
m
at
o
f messages with
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jona
t
h
a
n
Nieder
R
e
s
t
ructure documentat
i
on for git-mer
g
e-
b
ase
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Vin
c
ent
v
an Ravesteijn
Documentatio
n
: upd
a
t
e
t
o
g
it
-
merge-ba
s
e --octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Junio
C Ha
m
ano
M
e
r
g
e branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2011-04-14
R
ené
S
cha
r
fe
archive: doc
u
ment limit
a
tio
n
of tar
.
umask config setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael
J
Gruber
t
3
306,t5304: avoi
d
clock sk
e
w i
s
sues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Mic
h
ael J Gr
u
ber
git
.
txt:
fix list continuat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
u
ni
o
C H
a
mano
Git 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ha
m
a
n
o
Merge
b
r
a
n
ch
'
maint'
commit
|
commitdiff
|
tree
2011-04-13
J
unio
C Hama
n
o
Merge branch 'jc/rev-list-op
t
ions-fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ham
a
n
o
Merge branch 'js/checkout
-
un
t
ra
c
ked-sy
m
link' into m
a
int
commit
|
commitdiff
|
tree
2011-04-13
J
onathon Ma
h
mergetool: Teach about submodules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Jim Me
y
er
i
ng
remove do
u
bled w
o
rds, e
.
g
.
, s/to to/to/, a
n
d
f
ix related
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next