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
t4018 (funcname patterns): make .gitattributes state easier to track
2011-05-22
Jona
t
han Ni
e
de
r
t4018 (funcname
p
atterns):
mak
e
.
gitattrib
u
tes state
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Micha
e
l J G
r
uber
git-svn: Fix
g
it
s
vn log --
s
how-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
Jona
t
han N
i
eder
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 Hamano
Up
d
ate draft 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 Haman
o
Merge
b
ra
n
ch '
j
n/
m
aint-form
a
t-patch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
am
a
no
Merge branch 'ss/cherry-pick-x-doc'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'vr
/
merg
e
-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hama
n
o
Merge branch 'sr/maint-fast-i
m
port
-
t
i
ghten-op
t
ion-p
a
rsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge bra
n
ch 'jc/t1506-shell
-
param-expansion-gotc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
Hamano
M
e
rge
branch 'jc/f
i
x
-
ad
d
-
u-unme
r
ged' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge branch '
j
n/gitweb-de
p
endenc
y
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o C Hamano
Merge
b
ranch 'j
c
/m
a
int-branch-
m
er
g
eoptions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
M
er
g
e bra
n
ch 'jc/maint-add-p-o
v
erlappin
g
-hun
k
s' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyerin
g
Documentation/git-fsck
.
txt: fi
x
typo:
unreadable
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Updat
e
draft
release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Ham
a
no
Merge branch 'cn/
f
or
m
at-p
a
tch-quiet' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'jm/mergetool-submodu
l
es' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Merge branch 'jk/
f
or
m
at-patch
-
q
uote
-
spe
c
i
al-in-
f
rom
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge b
r
anch 'vh/gi
t
-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
unio
C
Hamano
git
_
open_noa
t
ime
(
): d
r
o
p
unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha
1
_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jo
n
a
t
han Nie
d
er
a
d
d
, m
e
rge,
d
i
f
f
: do no
t
us
e
strcasecmp to
c
ompare
.
.
.
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
M
e
rge branc
h
'aw/maint-
r
e
b
ase-i-p-no-f
f
' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'js/bl
a
me-par
s
en
a
me' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
anch 'gr/
c
vsimpo
r
t-alterna
t
i
ve-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merg
e
branch 'cj/p4merge' in
t
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge branch
'
jk/merge-one
-
file-
w
o
r
k
ing-tree
'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
M
erge branch '
j
c/fix-di
f
f-
f
il
e
s-unme
r
ged' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C H
a
mano
M
erge
branch 'mz/maint-rename-unmerged
'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: F
i
x
a co
u
ple of t
y
pos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C Hamano
t
1
507: avoid "${par
a
meter
<
op>'word'}"
inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio
C
Hamano
t370
1
: add-p-fix make
s
t
h
e l
a
st test to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebs
k
i
Remove
g
itweb
/
g
itweb
.
c
g
i and other legac
y
t
a
rgets
fro
m
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
git-instaweb: Simp
l
i
f
y build dep
e
ndenc
y
on
g
i
tweb
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
Hama
n
o
merge: ma
k
e branch
.
<
n
ame>
.
mergeo
p
ti
o
ns
c
orrectly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Britto
Remove duplicated "i
s
a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre R
a
bbe
l
ier
fast-import: fix optio
n
p
a
rser f
o
r no-arg option
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C
H
amano
t37
0
1
:
fix
h
ere
d
ocum
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gruber
git-fast-impor
t
.
txt: --relative-marks tak
e
s no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dim
a
Shar
o
v
sh
e
ll: add
missing
init
i
a
lization of argv0_pat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Bri
a
n Gernh
a
rdt
t/annotat
e
-tests: Use echo & cat
i
ns
t
ead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge b
r
anch 'j
h
/dirsta
t
' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ran
c
h 's
p
/maint-clear-postfie
l
ds' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e branch 'jk/mai
n
t-stash-oo
b
' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merg
e
b
ranch 'jk/ma
i
nt-upload-pack-shallow'
i
nto
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merge b
r
anch 'dm/stash-
k
-i-p
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
M
er
g
e branch 'jc/p
a
ck-o
b
ject
s
-bigfile' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge
branch 'mg/r
e
flog-wi
t
h-options'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge
branch 'jk/stash-loos
e
n-safety'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
bran
c
h 'ar
/
c
le
a
n-rmdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge
b
r
anch '
m
g/sha1-path-a
d
vise' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Valen
t
in Haenel
git-add
.
txt: do
c
ument 'add
.
igno
r
eEr
r
o
r
s
'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciar
a
n
Jessup
Pass e
m
pty f
i
le
t
o
p
4mer
g
e where
n
o ba
s
e is suita
b
le
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
G
u
y
Rouillier
L
ook
f
or
p
a
ssw
o
r
d in both CVS and
C
VS
N
T
pas
s
wo
r
d file
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jef
f
K
i
ng
merge
-
one-file:
fix broken me
r
ges wi
t
h
alter
n
ate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests
f
or merge-
i
ndex / merge-one-fi
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
amano
"add
-
p
": work-around
a
n
o
l
d
l
azin
e
ss that
d
o
e
s not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
a
d
d--int
e
ractive
.
perl: factor
o
ut repeated --
r
ecount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hama
n
o
t3701: Ed
i
t
ing a spl
i
t
hunk in an "
a
dd -p" s
e
s
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C
Hamano
ad
d
-p: 'q'
should rea
l
l
y
q
u
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Sta
r
t 1
.
7
.
5
.
1 ma
i
nte
n
ance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
ma
n
o
Merge branch 'mg/x-years-12-
m
onths' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-s
e
nd-
e
mail: fix missing spa
c
e
in
error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jo
s
h Stone
blame: tolerate bogus e-m
a
il addr
e
sse
s
a bit
be
t
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
git-r
e
base--i
n
t
eractive
.
sh:
preserve-
m
e
r
ges
f
ails
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Je
f
f
King
pretty: quote rfc
8
22 s
p
ecials in e
m
ail addresse
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin
H
ae
n
el
git-sv
n
.
txt: smal
l
t
ypeface impro
v
ements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin H
a
ene
l
git
-
svn
.
t
xt: move option d
e
s
c
riptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
a
lentin Haene
l
gi
t
-
s
v
n
.
txt: fix usage of
-
-add-author-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Ju
n
io C Hamano
http:
c
lea
r
POSTFIEL
D
S
when i
n
itializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Ham
a
no
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C H
a
mano
Fix
"add
-
u" that sometimes f
a
ils to
resolve un
m
e
rged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff-fil
e
s: show unme
r
ged entri
e
s
co
r
re
c
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Haman
o
d
i
ff: r
e
move
o
ften unus
e
d parameters from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
.
c:
re
t
u
rn filepair from dif
f
_unmerge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
m
ano
test: use $_z
4
0 from
t
est-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J
G
r
uber
date: av
o
id "X ye
a
rs, 12 month
s
" in relative
d
a
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Gi
t
1
.
7
.
5-rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o C
H
ama
n
o
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
Michael J
G
ruber
git-
s
vn
.
txt:
D
o
cumen
t
-
-mergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio
C Hamano
Re
v
ert "run-command: pr
e
ttify -D
_
F
O
RTIFY_SOURCE wor
k
aro
u
nd"
commit
|
commitdiff
|
tree
2011-04-15
Sebasti
a
n S
c
h
u
berth
d
o
c: Clarify that "cher
r
y
-
pick -x"
d
o
e
s not use "git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nieder
Docu
m
entation: des
c
ribe the
format of mes
s
age
s
wi
t
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 Nie
d
er
Re
s
tructure docu
m
entation for git-merge-
b
ase
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
V
i
nc
e
nt
v
a
n Raves
t
e
i
jn
Do
c
um
e
ntation: update to
git-merge-base -
-
octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
M
er
g
e b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2011-04-14
Ren
é
Schar
f
e
archive: document limita
t
ion
o
f
tar
.
umask config setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mi
c
hael J Gruber
t3306
,
t
5304: avoid clock sk
e
w i
s
sues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
M
ichael J Gruber
git
.
txt: fix li
s
t co
n
tinuat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
J
unio
C
Hamano
Git 1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hama
n
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge
b
ranch 'jc/rev-l
i
s
t-options-fi
x
' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merg
e
branch 'js/checkout-untrac
k
ed-symli
n
k' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
merg
e
tool:
T
e
a
ch abou
t
s
u
bmodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyering
r
e
move doubled words, e
.
g
.
, s/to to/t
o
/, and fix rela
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar
Ramachandra
r
e
vert: Hide '-r' option in default usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next