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
difftool: add various git-difftool tests
2009-04-08
David
A
gui
l
ar
difftool: add variou
s
git-dif
f
tool tes
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
dif
f
tool: move
'
git-
d
ifftool' o
u
t of contrib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Sebastian Pipping
di
f
ftool/merget
o
ol: add diffuse a
s
merge
a
nd diff too
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
if
f
to
o
l
:
add
a
-
y sh
o
rtcut for --no-prompt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
dif
f
tool: use perl
built-in
s
when testing
f
or
m
sys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
di
f
ftoo
l
: remove the ba
c
k
up fi
l
e fea
t
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: remove
merge optio
n
s for
o
pen
d
i
f
f
,
t
k
diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
rkus He
i
delber
g
git-merge
t
oo
l
: a
d
d
new merg
e
tool
T
ortoiseMerge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Mar
k
us Heidelb
e
rg
git-
m
e
r
getool/diffto
o
l: make
(g)vim
d
iff
w
o
r
kable under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Marku
s
Heide
l
b
e
rg
doc/merge-config: list ecmerge as a built-
i
n m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
t
thi
e
u Moy
git-rev-list
.
txt: make asc
i
i ma
r
k
u
p unifo
r
m wi
t
h o
t
he
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Mat
t
hieu
M
oy
git
-
send-email
.
t
xt
:
clarify which
o
pti
o
n
s
ta
k
e an argu
m
en
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
J
unio C
Hamano
Merge br
a
nch 'jc/name-branc
h
'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Ha
m
ano
Merge branc
h
'jc/shared-literally'
commit
|
commitdiff
|
tree
2009-04-06
Ju
n
io C
H
ama
n
o
Merge branch
'
mg/tracked
-
l
ocal-branc
h
es'
commit
|
commitdiff
|
tree
2009-04-06
Junio
C
Ha
m
ano
Merge branc
h
'sb/fo
r
mat-p
a
tch-patchn
a
me'
commit
|
commitdiff
|
tree
2009-04-06
Felip
e
Contreras
u
s
er-m
a
nual: the name of the has
h
function is SHA-1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contrera
s
docbook: chang
e
css style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
F
e
lipe Contr
e
ras
user-manual:
r
emove s
o
m
e git-foo usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Sa
n
ti Béjar
Documentation: bran
c
h
.
*
.
merge
can also affect '
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Voigt
Add configurat
i
on variable
for
sign-off
to format-patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Todd
Zullinger
ba
s
h comple
t
ion: U
p
date 'git am'
o
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C H
a
m
an
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-04-05
Julien Danjou
git sub
m
odu
l
e: f
i
x usage
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
J
u
n
i
o C Haman
o
Mer
g
e br
a
nch 'maint-1
.
6
.
1' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merge
b
ra
n
ch 'm
a
int-1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus
H
eidelberg
doc/gi
t
-
p
a
c
k-refs
:
fix two grammar
iss
u
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
te
s
ts: rem
o
ve
e
x
it af
t
er
t
es
t
_done ca
l
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff Kin
g
c
o
mm
i
t: a
b
ort commit if
i
nt
e
ract
i
ve ad
d
failed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
C
hristian Co
u
d
e
r
bi
s
ect: impr
o
ve
error messa
g
e when branch checkout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Dan Mc
G
ee
git-repack: use non-dashed update-server-
i
nf
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
J
a
y
Sof
f
ian
send-email:
fix nasty
b
ug in as
k
() function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Update draft rele
a
s
e
notes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
a
n
o
Syn
c
with 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
GIT
1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Hama
n
o
Merge branch 'jc/ma
i
nt-1
.
6
.
0-blame-s' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hamano
Merge bran
c
h 'js/m
a
int-diff-temp-sm
u
d
ge' into
m
a
int
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'js/maint-1
.
6
.
0-exec-path-env' into
maint
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
H
amano
M
e
rge branch
'
bc/
m
aint-1
.
6
.
1-bran
c
h-delet
e
d-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
Merge b
r
anch 'tr
/
maint-1
.
6
.
1-d
o
c-format-pa
t
ch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge branch
'dm/maint-
d
o
cco
'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send
-
emai
l
: ens
u
r
e quoted addresses are r
f
c
2047 en
c
oded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay Soff
i
an
se
n
d-emai
l
:
correct two t
e
sts whi
c
h were going int
e
ractive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Merge branch 'ef/fast
-
export'
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Hamano
Merge branch 'mh/forma
t
-
patch-add-header'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Ha
m
ano
Me
r
ge branch 'tr/ma
i
n
t-1
.
6
.
1-d
o
c
-f
o
rmat
-
patch--root'
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Hamano
Merge b
r
an
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge
b
ranc
h
'maint-1
.
6
.
1
' into maint
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
M
e
r
g
e branch 'mai
n
t-1
.
6
.
0
' in
t
o
m
a
i
n
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
ano
M
e
rg
e
branch
'cj/doc-format'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'jc/m
a
int-
1
.
6
.
0-ke
e
p-
p
ack'
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o
C Hamano
Merge
b
ranch 'kb
/
track
i
ng-
c
ount-no-merges'
commit
|
commitdiff
|
tree
2009-04-02
We
s
l
e
y
J
.
Landaker
Documentat
i
on:
git-
s
vn: fix trunk/fetch svn-r
e
mot
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Björn
S
teinb
r
in
k
Mailmap: Allow empty e
m
ail address
e
s
to be mapp
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Mich
a
e
l J
G
ruber
Make local branches beha
v
e
like rem
o
t
e
b
ranches
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Heiko Voigt
Cleanup wa
r
ning
about k
n
o
w
n issues i
n
cvsimport documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
H
olger Weiß
Docum
e
ntation: Remove a
n
odd "inst
e
ad"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay So
f
fian
send-email: a
s
k_d
e
fault should a
p
ply to
a
l
l em
a
ils
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay
S
o
f
fian
se
n
d-email: don't att
e
m
pt to pro
m
pt if tty is closed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
eff
King
t1301:
loosen tes
t
for forced modes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff
K
ing
fix portability p
r
oble
m
wit
h
IS_RUN_COMMAND
_
ERR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
S
tephen Boyd
format_
s
anitiz
e
d_sub
j
ect:
Don't
t
rim past
i
nitial le
n
g
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Chri
s
Johnsen
Documentation
:
u
se "spurious
.
sp" XSLT if DOC
B
O
O
K_SUPPRESS_S
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Johannes Schindel
i
n
m
a
ilmap
:
resur
r
ect lower-casing of email ad
d
resses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Junio C Hamano
M
e
r
ge git:
/
/
g
i
t
.
bogomips
.
or
g
/g
i
t-
s
vn
commit
|
commitdiff
|
tree
2009-04-01
Ali Ghola
m
i Ru
d
i
b
uiltin-cl
o
ne
.
c: no need to s
t
rdup for seten
v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholam
i
R
u
d
i
bu
i
ltin-cl
o
ne
.
c: make jun
k
_p
i
d static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
Ha
m
ano
Merge
b
ranch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hama
n
o
U
pdat
e
dr
a
ft r
e
lease notes to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Mer
g
e branch
'
maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Haman
o
Merge branch 'main
t
-
1
.
6
.
0' into mai
n
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
D
o
c
umen
t
a
t
ion:
p
ush
.
defa
u
lt
a
pplies to all rem
o
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Documentati
o
n
:
e
n
hance b
r
anc
h
.
<n
a
me>
.
{remote,merge}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Danie
l
Cheng (aka
.
.
.
Fix
ba
s
h completion in path with sp
a
ce
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
bash completion:
o
nly show 'log --merge' if merging
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telmich- S
c
hot
.
.
.
git-tag(1): add hint ab
o
u
t
com
m
i
t m
e
s
s
ages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Allan Caffee
D
ocument
a
ti
o
n
:
update graph api
example
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge branch 'ma
i
nt-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
Ha
m
a
n
o
Merge branch 'm
a
int-1
.
6
.
0
'
int
o
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
J
a
y So
f
fian
send-email: add
t
ests f
o
r refactored pr
o
mpt
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay Sof
f
ian
send-ema
i
l: refactor and ensur
e
prompting
d
oesn't loo
p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
git-svn: fix ls-tree u
s
age with das
h
-prefixed paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Johannes Schi
n
delin
i
mport-z
i
ps
:
fix thi
n
ko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
buil
t
in-fast-export
.
c: ha
n
d
l
e nested
t
ags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik F
a
ye
-
L
un
d
built
i
n-
f
ast-export
.
c: fi
x
crash on
t
agged trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
b
u
iltin-f
a
st-export
.
c: turn error into warni
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
E
r
i
k
Faye-Lund
test-suite: adding a test fo
r
fast-export
w
ith tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ha
m
an
o
se
t
_sh
a
r
e
d_per
m
(): sometimes
w
e know what the final
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Jun
i
o C Haman
o
move_temp_to_file()
:
do not forget to chmod() in "Coda
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Haman
o
Update draft release notes to
1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
M
e
rge branch 'jc/maint
-
1
.
6
.
0-di
f
f-borrow-ca
r
efully'
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
io C Ha
m
ano
Merge
b
ran
c
h
'js/remote-improvem
e
n
ts
'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge b
r
anch 'jk
/
clone-post-chec
k
out'
commit
|
commitdiff
|
tree
2009-03-28
Junio C
Hamano
M
e
rge
b
ranch 'maint-1
.
6
.
1
' into maint
commit
|
commitdiff
|
tree
2009-03-28
E
mil Sit
test-lib: Cl
e
an
up com
m
en
t
s and Makefile
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Mic
h
ael He
n
dr
i
cks
form
a
t-patch: add arbitrary
e
ma
i
l he
a
ders
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
Move chmod(foo, 044
4
) int
o
move_temp_to_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hama
n
o
"core
.
s
h
aredrepositor
y
= 0mode" should set,
not loosen
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next