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
init/clone: remove short option -L and document --separate-git-dir
2011-05-25
N
g
uye
n
Thai Ngoc
D
u
y
init/clone: remove sh
o
r
t
opt
i
on -L and do
c
ume
n
t --separat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Grub
e
r
git-svn: F
i
x git svn
l
og --show-commit
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
Jon
a
than Nied
e
r
provide a copy of the
L
GPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Upda
t
e
dra
f
t r
e
l
ease no
t
es
to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e branch 'jn/
m
aint-
f
ormat-patch-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
Haman
o
Mer
g
e
branch 'ss/cherry-pick-x-doc'
into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
ni
o
C H
a
mano
Merge branch '
v
r/merge-
b
ase-doc' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C
Hamano
Mer
g
e branch '
s
r/
m
aint-f
a
st
-
import-t
i
ghten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
M
e
rge branch
'
jc/t1506-shel
l
-param-e
x
pa
n
sion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge bra
n
ch 'jc/
f
ix-add-u-unmerged
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Mer
g
e branch 'jn/gitweb-depe
n
de
n
cy' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ha
m
ano
Merge br
a
nch 'jc/maint-branch-mergeoption
s
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
a
mano
Merge bran
c
h
'
j
c
/maint-add
-
p-overlapping-h
u
nks
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Me
y
ering
Documentation/git-fsck
.
txt:
f
i
x typo: unrea
d
a
b
le -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Haman
o
Update draft re
l
ease no
t
e
s 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
nch 'cn/format-patc
h
-q
u
iet' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge bra
n
ch 'jm/
m
ergetool-submo
d
ules' int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io
C
Hamano
M
erge
branch 'jk/form
a
t-patch-qu
o
te-special-in
-
fro
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'vh/git-sv
n
-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_open_n
o
atime(): drop
u
n
u
sed para
m
e
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
sha1_file: typ
o
f
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jon
a
than Nieder
a
d
d
, merge, d
i
ff: do not use st
r
casecmp
t
o
compare
.
.
.
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
Jun
i
o C Hamano
Merge branch 'aw/maint-
r
eba
s
e-i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
M
e
rge branch 'js/blame-parsename
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge branch 'gr/cvsimp
o
rt-alt
e
r
n
ative-c
v
s
pass-locatio
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'
cj/p4merge' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
bra
n
ch 'jk/merge-on
e
-
file-working-tree' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C Hamano
M
erg
e
bran
c
h 'jc/
f
i
x
-diff-files-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge br
a
n
ch '
m
z
/
ma
i
nt-
r
ename-
u
n
merged' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
ohan Herland
t
5
400: F
i
x a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ham
a
no
t1507: avoid "${parameter<op
>
'w
o
rd'}" inside do
u
ble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Ju
n
io C
Hamano
t3701:
add-p-fix ma
k
e
s the l
a
st test to pas
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Remo
v
e
gitweb/gitweb
.
cgi a
n
d
other legacy 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 Nar
e
bski
git-inst
a
web: S
i
mplify
b
uil
d
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
J
u
nio C
H
amano
m
erge: make branch
.
<name>
.
m
e
rg
e
optio
n
s correctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João
B
ritto
Remove duplica
t
ed "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
S
v
err
e
R
abbelier
fas
t
-import: fix
o
pt
i
on par
s
er
for no-arg options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701:
f
ix here documen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gr
u
ber
git
-
fast-im
p
ort
.
txt: --relat
i
ve
-
marks take
s
no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
sh
e
ll:
a
d
d missing
i
nitializa
t
io
n
of argv0
_
path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Ger
n
hard
t
t/annotate-tests: Us
e
echo & c
a
t instea
d
of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
uni
o
C
Ham
a
no
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/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge branch 'sp
/
maint-c
l
ear-p
o
stfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
Hamano
Merge
branc
h
'jk/maint-stash
-
oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
nch 'jk/maint-upload-pack-shall
o
w'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'dm/stash-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e branch 'j
c
/pack-obje
c
ts-bigfil
e
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C H
a
mano
Merge branch 'mg/reflog-w
i
th-optio
n
s' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
anch 'jk/
s
t
a
sh
-
lo
o
sen-safety' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e br
a
nch 'ar/c
l
ean-rmdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
M
erge branch 'mg/sha1-path-advise' into maint
commit
|
commitdiff
|
tree
2011-05-04
V
alent
i
n
Haen
e
l
git-a
d
d
.
tx
t
: do
c
ument
'
add
.
i
g
noreEr
r
ors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Cia
r
an Jessup
Pas
s
empty f
i
le to
p
4merge whe
r
e no ba
s
e is sui
t
able
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy R
o
uillier
Look fo
r
password i
n
both CVS and CV
S
NT password
f
iles
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-on
e
-f
i
le: fix broken mer
g
es with al
t
e
r
nate
w
ork
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff K
i
ng
add test
s
fo
r
merge-index / merge-one-fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio
C
Hamano
"a
d
d -p": work-aroun
d
an old laziness that does n
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Ham
a
no
add--
i
nteractive
.
perl: factor out repe
a
ted
--recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3701:
E
diting a split hunk in
an "add -
p
" session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
n
o
add -p: 'q' shou
l
d really qu
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
S
t
a
rt 1
.
7
.
5
.
1 mainte
n
ance
tra
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
amano
Merge
branch
'
mg/x-years-12-
m
onths'
into maint
commit
|
commitdiff
|
tree
2011-04-29
S
y
lvain Rabot
git-send-email: f
i
x m
i
ssin
g
space in error 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:
t
ol
e
rate bogus e-mail addresses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
g
i
t-
r
ebase--interactive
.
sh
:
pr
e
serve-merges
f
a
i
l
s
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff Ki
n
g
pretty: q
u
ote rfc822 specia
l
s in e
m
ail
address
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
n
ti
n
Ha
e
nel
g
i
t-sv
n
.
tx
t
: small ty
p
eface
improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin
Haenel
git-
s
v
n
.
txt: move option
descriptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valenti
n
Haenel
gi
t
-svn
.
txt:
f
ix usage of --add-
a
u
thor-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
unio C
Hama
n
o
http: clear POSTFIEL
D
S w
h
e
n initializ
i
n
g
a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio
C
Ham
a
no
Git
1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
H
a
m
a
n
o
Fi
x
"a
d
d -u" that sometim
e
s fails to resolve un
m
erged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C
H
am
a
no
d
i
ff-files: show unmerged en
t
ries correctl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C
H
amano
d
iff: remove often unused
p
a
ramet
e
rs
f
r
om
d
iff_unme
r
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C H
a
m
a
no
diff
.
c: r
e
turn filep
a
ir f
r
o
m diff_u
n
merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
t
e
st: 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 yea
r
s, 12 months" in relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Gi
t
1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
unio C Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Mi
c
hae
l
J Gru
b
er
git-
s
vn
.
txt: Document --mergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Ha
m
ano
Revert "run
-
c
o
mmand:
prettify -D_FORTIF
Y
_
S
OURCE wo
r
k
a
round"
commit
|
commitdiff
|
tree
2011-04-15
Sebastian Schuberth
doc: Cla
r
ify that "cherry-pick -x" d
o
e
s not use "git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jo
n
athan Nie
d
er
Documen
t
a
t
io
n
:
d
e
scribe
the format
o
f messa
g
es wit
h
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan
Nieder
Restru
c
tu
r
e
d
ocumentation
for
git
-
merge-
b
ase
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
V
in
c
ent
v
an
R
avesteijn
Documentatio
n
:
u
pd
a
t
e
t
o
git-merge-base -
-
o
ctopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Jun
i
o
C
H
a
mano
Merge
bran
c
h
'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
archive: docu
m
e
n
t li
m
itation of tar
.
umask confi
g
setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael
J
Grub
e
r
t3306,t5
3
0
4
: avoid clock skew issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
M
ichael
J
G
ruber
git
.
t
xt: fix l
i
st continuation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio
C Hamano
Git 1
.
7
.
5-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C
Hamano
Mer
g
e branch
'
m
aint
'
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io C Hamano
Merge bra
n
ch 'j
c
/rev-list-options-fix' into
maint
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io C Hamano
Merge branc
h
'js
/
checkout-untracked-symlink
'
into
m
aint
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
merge
t
ool:
T
e
ach about subm
o
dules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ji
m
Meyering
remove dou
b
led
w
ords,
e
.
g
.
, s/to to/to/, a
n
d fix re
l
ated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ra
m
kumar Ra
m
achan
d
r
a
revert: Hide '-r' op
t
ion in de
f
a
u
lt usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next