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
t4018 (funcname patterns): minor cleanups
2011-05-22
Jonathan N
i
eder
t4
0
1
8 (f
u
ncname patterns):
minor cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-22
J
o
nathan
N
ieder
t
4
018 (funcna
m
e patterns): ma
k
e
configu
r
a
tion
e
asier
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-22
Jonathan Nieder
t
4018 (func
n
ame patterns): mak
e
.
gitattributes
s
tate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Mi
c
hael J Gruber
git-
s
vn: Fix git svn log --sh
o
w
-commi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio
C Ham
a
no
G
i
t 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nieder
provide a copy of the LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Update draft relea
s
e
n
otes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge
branch 'jn/m
a
int-format-patch-doc' into main
t
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o
C Hamano
Merge branch 'ss
/
cher
r
y-pick-x-doc' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merg
e
branch 'vr/me
r
g
e-base-doc' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge branch 'sr/maint-
f
ast-impo
r
t-tighten-
o
ption-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Me
r
ge b
r
an
c
h '
j
c/t1
5
06-sh
e
l
l
-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge b
r
anch 'jc/fix-add-u-unmerged' i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o C Hamano
Mer
g
e
br
a
n
ch 'jn/gitweb-
d
ep
e
nd
e
ncy' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio
C Ha
m
an
o
M
e
rge
b
ranch 'j
c
/maint-branch-mergeo
p
tions'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
g
e
b
ranch
'jc/maint-
a
d
d-
p
-
o
verlapp
i
ng-hu
n
k
s' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyeri
n
g
Documenta
t
ion/git-fsck
.
txt: fix typo: un
r
eadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
U
p
date draft release n
o
t
es to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C H
a
mano
M
e
r
ge branc
h
'cn/
f
o
r
mat-
p
atch-quie
t
' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
M
e
r
ge branc
h
'j
m
/
m
e
rgetool
-
sub
m
odul
e
s'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Ha
m
ano
M
erge
b
ranch 'jk/forma
t
-patch-quot
e
-
s
pe
c
ia
l
-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Merge branch 'vh/
g
it-sv
n
-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
git_open_noatime():
dro
p
unused pa
r
am
e
te
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
sha1_file: ty
p
ofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonatha
n
Nieder
add, merge, d
i
ff: do n
o
t use strcasecmp to comp
a
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Prepa
r
e for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Ha
m
a
no
Merge branch 'a
w
/
m
aint-rebase-i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
amano
Merge branch 'js/bla
m
e-
p
ar
s
ename' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge
branch
'gr/cvsimp
o
rt-alternative-
c
v
s
p
ass-
l
ocation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C Hamano
Merge branch 'cj
/
p4merge' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
m
ano
M
e
rge branc
h
'
j
k/mer
g
e-one-file-work
i
ng-t
r
ee' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Ham
a
no
Merge branch
'
jc/fix-diff-
f
i
les-unmerged' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C
Hamano
Merge branch '
m
z/maint-ren
a
me-unme
r
g
e
d' into main
t
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rla
n
d
t
5400: Fix a couple
of t
y
po
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Hamano
t15
0
7:
avoid "
$
{para
m
eter<op>'word'}
"
ins
i
de
double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio
C
Hamano
t37
0
1
:
a
d
d-p-fix
make
s
t
he last test to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Remove gi
t
web/gitweb
.
cgi
and other le
g
a
cy
t
ar
g
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
Jakub Nar
e
b
ski
g
i
t-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 Hama
n
o
merge: ma
k
e bra
n
ch
.
<name>
.
merge
o
ption
s
correctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João
Britto
Remove dupli
c
a
t
ed "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre
Rabbelier
fa
s
t-
i
mport: fix option parser for no-arg options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Jun
i
o C Hama
n
o
t3701: fix here do
c
ument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gruber
git-
f
ast-im
p
ort
.
txt: --relative-
m
a
r
ks
takes no par
a
me
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Di
m
a
S
haro
v
shell:
add
m
iss
i
ng initialization of argv0_pa
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t/anno
t
ate-tests: Use echo & cat inst
e
ad of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Ham
a
n
o
Git
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
M
erge br
a
nch 'jh/dirsta
t
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge branch 'sp/main
t
-
cl
e
ar-postfi
e
lds
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge
b
ranch 'jk/mai
n
t-s
t
a
s
h-oob' i
n
t
o
main
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branch 'jk/maint-uplo
a
d-pack-sha
l
low'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Ham
a
no
Merge
b
ranch 'dm/s
t
ash-k
-
i-p
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branch 'jc/p
a
ck-o
b
jects-
b
igfile' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
r
ge b
r
anch 'mg/reflog-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merge branch
'
j
k/stas
h
-l
o
ose
n
-safety' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
H
amano
Merge
b
ra
n
ch 'ar/clean-rmdir-empty'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C Hamano
Me
r
ge branch 'm
g
/
s
ha
1
-
path-a
d
vis
e
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Ha
e
nel
git-add
.
txt: document
'
add
.
ig
n
oreErrors'
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 file to p4merge where n
o
base is suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouilli
e
r
Loo
k
f
or password in both
C
VS and CVSNT p
a
ssword f
i
les
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
K
ing
merg
e
-one
-
fil
e
: fix b
r
oken merges wit
h
a
l
ternate wor
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
a
dd tests f
o
r merge-i
n
d
ex
/
merge-one-fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hamano
"add -p"
:
w
ork-
a
round an old laziness t
h
at does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
add--interactive
.
perl: factor out repeated --recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
m
ano
t
3701: Editing a split hun
k
in an "add
-p" session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hamano
add -p: 'q' should
r
ea
l
l
y q
u
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
io C
H
amano
Start 1
.
7
.
5
.
1 ma
i
ntenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
i
o
C H
a
mano
Merge branc
h
'mg/
x
-years-12-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rab
o
t
git-send-e
m
a
il: fix m
i
ss
i
ng space in error messa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: toler
a
te
bogu
s
e-mail a
d
dress
e
s
a bit
b
etter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
git-rebase--interactive
.
s
h: preserve-
m
erges fails 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 spec
i
als in
email addre
s
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in Haene
l
git-svn
.
txt: smal
l
ty
p
efa
c
e
i
mprovements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin
Haenel
g
it-svn
.
tx
t
:
m
o
ve option
description
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin H
a
e
nel
g
it-svn
.
txt: fix
usage of
--add
-
a
u
thor-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C
Hamano
h
t
tp: clear POSTF
I
ELDS w
h
en initializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
G
i
t
1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Ha
m
a
no
F
i
x "add -
u
" t
h
at sometimes fails
t
o resolve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
-
files: show u
n
merge
d
entries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff:
r
emove ofte
n
unused parameters fro
m
diff_unmer
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
d
i
ff
.
c: return
filepa
i
r fro
m
diff_
u
nmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
te
s
t: use $_z40 from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gr
u
ber
date: avoid "X
y
ears, 12 mont
h
s
" i
n
relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Git 1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Ham
a
n
o
Sync w
i
t
h 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Gi
t
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Mich
a
el J Gru
b
er
git-svn
.
txt: Do
c
ument --mergeinf
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Ham
a
no
Revert "run-command: prettify -D_FORTIFY_SO
U
R
C
E
w
orkaround"
commit
|
commitdiff
|
tree
2011-04-15
Sebastian S
c
hu
b
erth
doc
:
Cl
a
rif
y
t
h
at "cherry-pick -x" does not use "git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nieder
D
o
cumentation: describe the
f
ormat of m
e
ssages with
.
.
.
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
R
estruc
t
ur
e
d
o
cumentation
for git-merge-b
a
se
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Vincent
v
a
n
Ravesteijn
Documentation:
u
p
d
ate
to gi
t
-merg
e
-base --octo
p
us
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Ju
n
io C
Ha
m
a
n
o
M
erge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
archive: document limitation
o
f
t
ar
.
umask c
o
n
fi
g
s
e
tting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J
G
ruber
t3306,t5304: avoid clock s
k
e
w
is
s
ues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
git
.
txt:
fi
x
l
i
s
t
continuat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C H
a
m
a
no
Git 1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ha
m
ano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hama
n
o
Me
r
g
e branch 'jc/rev-
l
ist-options-fix'
into
m
aint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merg
e
b
ranch
'js/checkout-untracked-symlink
'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
mergetool: Teach abo
u
t sub
m
od
u
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next