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
bisect: refactor sha1_array into a generic sha1 list
2011-05-20
J
eff King
bi
s
ect: refactor sha1
_
array in
t
o
a generic sha1 list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jeff
King
refactor refs_from_a
l
ternate
_
cb
to
a
llow
passing extra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Update
d
ra
f
t
releas
e
notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge
b
ra
n
ch 'jn/maint-format-patch-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge bran
c
h 'ss/ch
e
rry-pi
c
k-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Ham
a
no
Merge branch
'
vr/me
r
g
e
-
base-doc'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Mer
g
e bran
c
h
'
sr/maint-fast-i
m
port-tighten
-
option
-
parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
ni
o
C Hamano
Merge branch 'jc/t1506-she
l
l-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio
C
Hamano
M
e
rge branch 'jc/fix-add
-
u-un
m
er
g
ed'
i
n
t
o
m
ain
t
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge branch 'jn/gitweb-dependenc
y
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
a
n
o
Merge bra
n
ch
'
jc/maint
-
bran
c
h-mergeopti
o
ns' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
M
erge
branch '
j
c/maint-add-p-
o
v
e
rlapping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Do
c
umentation/git-fsck
.
txt: fix typo: un
r
e
adable
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Update draft release
notes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
un
i
o C Haman
o
M
e
rge branch 'cn/f
o
r
m
at-patch-qu
i
et' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merg
e
branch 'jm
/
merget
o
ol-submod
u
les' int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Merge branch
'jk/format-patch-
q
uote-sp
e
c
ial-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
aman
o
Me
r
ge
branch
'vh/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
g
i
t_o
p
en_noa
t
ime(): drop unuse
d
paramete
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio
C
Hamano
sha1_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jona
t
han Nie
d
er
add,
me
r
g
e, diff: do not use
st
r
c
a
secmp to compar
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Pre
p
are for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C Hamano
Mer
g
e bra
n
ch 'aw/maint-
r
ebase-i-p
-
no-ff' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge
b
ranch 'js/bla
m
e-par
s
ename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Me
r
ge branc
h
'gr/cvsimport-alt
e
rna
t
ive-cvspass-loc
a
tion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge
branch
'
cj/p4merge
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
J
uni
o
C
Hamano
Merge br
a
nch '
j
k
/merge-one-fil
e
-working-tree' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C
H
a
mano
Merge branch
'
jc/fix-diff-files-unmer
g
ed' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge br
a
nch 'mz/maint-r
e
nam
e
-
unmer
g
ed' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Johan Her
l
and
t540
0
:
Fix a couple o
f
t
ypos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
u
n
io C Hamano
t1507: avoid "${parameter<op>'w
o
rd'}" inside doubl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C H
a
mano
t3
7
01: a
d
d-p-fix makes
th
e
l
a
s
t test
t
o
pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Na
r
ebski
Remove gitweb/gitweb
.
cgi
a
n
d
o
t
her lega
c
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
N
a
r
ebski
g
i
t-inst
a
we
b
:
Simplify build dependency on gi
t
w
eb
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
mer
g
e: ma
k
e
b
ranch
.
<na
m
e
>
.
m
ergeo
p
tions correctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Britto
Re
m
ove dupl
i
c
a
t
ed "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabbelier
fast-import:
fix option
p
arser fo
r
no-arg
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
i
o
C Hamano
t3701: fix her
e
document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
M
ichael J Grub
e
r
git-fast-import
.
txt: --relative-mark
s
takes no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sha
r
ov
she
l
l:
add missing initia
l
izati
o
n of a
r
gv0_pat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t/annota
t
e-tests: Use e
c
ho & cat instead
o
f
s
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Haman
o
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
anch 'jh/dirs
t
at'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
branch 'sp
/
main
t
-
c
l
ea
r
-postfields' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch 'jk/ma
i
nt-s
t
ash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Ha
m
ano
Merge branch 'j
k
/maint-uploa
d
-pack-sha
l
low' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge branch '
d
m
/stash
-
k-i-p
'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
M
e
rge bran
c
h 'jc/pack
-
o
bje
c
ts-bigfil
e
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
H
amano
M
erge
b
r
anch 'm
g
/reflog-with-opt
i
ons' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch 'jk/stash-loosen-safe
t
y' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Ha
m
ano
Merge branch 'ar/clean-rmdir-e
m
pty' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
mano
Merge branch 'mg/sha1-path-advis
e
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
git-add
.
txt: document
'add
.
ignoreE
r
rors'
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 empty file to p4merge where no
base is
s
u
itable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Look for pas
s
w
ord
i
n bo
t
h CV
S
and CVSNT pass
w
ord
f
iles
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Je
f
f King
merge
-
o
ne-file: fix broken merge
s
with
alter
n
a
t
e w
o
rk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Ki
n
g
add te
s
t
s
for merge-index / merge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
"add -p": work
-
around an old laziness that does
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C
H
a
m
ano
add-
-
in
t
era
c
tive
.
perl: factor out repeated --recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
t
3701
:
Editing a split hun
k
in an "add -p" s
e
ssion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hamano
add -p: '
q
' sho
u
ld re
a
l
l
y
quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
i
o C Hamano
Start 1
.
7
.
5
.
1 mainten
a
nce tr
a
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
Merge branch 'mg/x-
y
ears-
1
2
-
mon
t
hs' into maint
commit
|
commitdiff
|
tree
2011-04-29
Syl
v
ain Rab
o
t
g
it-
s
end-em
a
il: fix m
i
ssing sp
a
c
e in err
o
r mes
s
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
osh Stone
blame: t
o
lerate bogus e-mai
l
addresses
a
bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andr
e
w Wong
git-rebas
e
--interact
i
v
e
.
s
h
: pres
e
rve-merges fails o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
e
ff King
pre
t
ty: quote rfc822
s
p
ecials in email addre
s
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
tin Haenel
g
i
t-svn
.
txt: small typef
a
ce improvemen
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
g
it-svn
.
t
x
t: mo
v
e opti
o
n de
s
cripti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
tin Haene
l
gi
t
-svn
.
t
x
t: fix usage o
f
--add-au
t
hor-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C
Hamano
http: clear POSTFIE
L
DS when in
i
tiali
z
ing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
n
io C Hamano
G
it
1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fix
"
add -u"
t
hat som
e
times fails
t
o resolve
unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio
C Hamano
d
i
ff-files: s
h
ow unmer
g
ed
e
ntrie
s
c
orrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
n
i
o C H
a
mano
diff: remove
often unused parameters
f
r
om diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o
C
Hamano
d
iff
.
c: return
f
i
lepair f
r
om diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
t
e
st: use $_z40
f
rom
tes
t
-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
M
ichael
J Gruber
d
ate:
a
void "
X
years,
12 months"
i
n rel
a
tive date
s
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 Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hama
n
o
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Grube
r
git-svn
.
txt:
Document
--mergeinf
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Juni
o
C Hamano
Revert "run-command: p
r
ettify -D_FORTIFY_SOURCE workar
o
u
nd"
commit
|
commitdiff
|
tree
2011-04-15
Seba
s
tia
n
Sch
u
berth
doc: Cla
r
ify that
"c
h
e
rry-pick -x" does no
t
use "
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nieder
Documen
t
ati
o
n: describe the
format of messages w
i
th
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonatha
n
N
i
ede
r
Rest
r
u
ct
u
re documenta
t
ion for
git
-
merg
e
-base
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Vinc
e
nt van Raves
t
ei
j
n
Document
a
tion: up
d
at
e
to
g
it-merge-bas
e
-
-octop
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
ar
c
h
i
v
e:
document limitat
i
on of t
a
r
.
umask
co
n
f
ig set
t
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
M
ichael J Gruber
t
3
306,
t
5304: avoid clock sk
e
w
issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mich
a
el J Gr
u
be
r
git
.
t
x
t:
f
ix
list continua
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hama
n
o
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
branch
'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge branch 'jc/rev-l
i
s
t-options-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io C Hamano
Merge
b
ranch 'js/checkout-untracked-symlink' into
maint
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Ma
h
m
ergetool: Teach about submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyering
remo
v
e doubled word
s
, e
.
g
.
, s/
t
o to/to
/
, and fix
relate
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar R
a
machandra
revert
:
Hide '
-
r' option i
n
defau
l
t usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Car
l
os Martín N
i
eto
format
-
p
atch: document --quiet option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Ca
r
los Mart
í
n N
i
eto
format-patch: don't pass on the --quiet flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next