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
Da
v
i
d
Agui
l
ar
d
ifftool: add v
a
rious git-difftool tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Ag
u
ilar
difftool
:
m
o
ve 'git-difftool' o
u
t of contri
b
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Seba
s
tian Pippi
n
g
diff
t
oo
l
/mergetool: add
d
i
f
f
use as me
r
ge and diff
t
ool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
d
ifftool: add a
-y sh
o
rtcut for --no-prompt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
la
r
difftool
:
us
e
perl
b
u
ilt-ins w
h
e
n
testing for
m
sys
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol:
r
e
mo
v
e
the backup file feature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
diffto
o
l:
r
emove merge options for opend
i
ff, tkdiff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Markus He
i
del
b
erg
git-mergetool: add new merge
t
o
ol TortoiseM
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Markus
H
ei
d
elber
g
git-
m
er
g
eto
o
l/difftool
:
make
(g)vimd
i
ff w
o
r
k
a
b
l
e under
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelberg
do
c
/merge-config:
l
ist ecmerg
e
as
a bu
i
lt-in merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-rev-
l
ist
.
txt: make as
c
ii markup uniform with other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Mat
t
hi
e
u Moy
g
i
t-send-email
.
txt:
c
l
arify which options take an argume
n
t
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Ha
m
ano
Mer
g
e branch 'jc/nam
e
-branch
'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Ham
a
no
Merge branch
'jc/
s
hared-
l
itera
l
ly'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Ha
m
ano
M
erge b
r
anch 'mg/
t
racked-local-branches'
commit
|
commitdiff
|
tree
2009-04-06
Juni
o
C Hamano
M
e
rge branch 'sb/fo
r
mat-pat
c
h-patch
n
ame'
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contreras
u
s
er-manua
l
: the name
of
the hash function is SHA-1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Con
t
r
e
ras
docbook: c
h
ange c
s
s style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Feli
p
e
Co
n
treras
user-manual:
r
emove some git-foo usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Santi Béjar
D
o
c
u
m
entation: branch
.
*
.
merge can also affe
c
t 'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
H
e
ik
o
Voigt
Add
configur
a
ti
o
n variable for s
i
gn-off t
o
format-patch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Todd Zullinger
bash compl
e
tion: Update 'git am' op
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-05
Julien Da
n
jou
g
it submo
d
ule: fix usage line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hama
n
o
Merge b
r
anch '
m
aint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-05
Junio
C
H
amano
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelberg
doc/git
-
pac
k
-
r
efs
:
fix
two
grammar issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Je
f
f
K
i
ng
tests: remove exit after test_done c
a
ll
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
com
m
it:
abort
c
ommit if i
n
teractive ad
d
faile
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
C
hr
i
stian
C
oude
r
b
ise
c
t: improve
error message when branch check
o
ut
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Dan M
c
Gee
git-re
p
ack: use non-dashed update-se
r
ve
r
-info
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jay Sof
f
ian
sen
d
-email: f
i
x
nasty bug in ask() f
u
nction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C
H
am
a
no
Upda
t
e draft re
l
ease no
t
e
s
to 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hama
n
o
Sync with 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Ha
m
an
o
GIT 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Ha
m
ano
Mer
g
e
b
ranch 'jc/
m
aint
-
1
.
6
.
0
-
bla
m
e-s' into
maint
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio
C Hamano
Merge
b
ra
n
ch
'js/
m
aint
-
diff-temp-smu
d
ge'
into
maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merg
e
branch 'js/maint-1
.
6
.
0-exec-
p
ath-env' into
maint
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
Merge branch 'bc/maint-1
.
6
.
1-bra
n
ch
-
deleted-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Haman
o
Merge b
r
anch 'tr/maint-1
.
6
.
1-doc-format-patch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
J
unio C H
a
man
o
Merge branch
'dm/maint-docco'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send-email: e
n
sure quoted addres
s
e
s
a
r
e rfc2047 en
c
ode
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Jay
So
f
fia
n
send-email:
c
orrect two tests which
w
e
r
e going interactive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
J
u
n
i
o
C Hamano
Merge
b
ra
n
ch
'
ef
/
fast-ex
p
ort'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Haman
o
Merge branch '
m
h/
f
ormat
-
pa
t
ch
-
ad
d
-
h
eader'
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Ha
m
ano
Merge bra
n
ch
'
tr/maint-1
.
6
.
1-doc-form
a
t-patch--
r
o
ot'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Mer
g
e
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Haman
o
Me
r
ge
b
ranch 'maint-1
.
6
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io
C
Ham
a
no
Merge branch 'ma
i
nt-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
M
e
r
g
e branch 'cj/doc
-
f
o
rmat'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Merge br
a
nch 'jc/ma
i
nt-
1
.
6
.
0-keep-pa
c
k'
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Ham
a
n
o
Merge
br
a
nch 'kb/tr
a
cking-
c
ount-no
-
me
r
g
e
s'
commit
|
commitdiff
|
tree
2009-04-02
Wesley J
.
Landak
e
r
Documenta
t
io
n
: g
i
t-svn: fix trunk/fet
c
h
svn-re
m
ote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
B
j
ö
rn Steinbrink
Mailma
p
:
Allow em
p
ty email addresses to b
e
mapped
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Michael J
Gruber
Make local branches behave like
r
e
m
ote b
r
anches
when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
He
i
ko Voigt
C
l
eanu
p
warning about known
i
s
s
ues i
n
cv
s
import docu
m
entation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Holger Weiß
Documentation: Remove an odd "instead"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-email:
a
sk_
d
efaul
t
s
h
oul
d
apply to all emails
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
s
e
n
d-email: don'
t
atte
m
pt to prompt if tty is closed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t
1
301
:
l
oo
s
en test for forced m
o
des
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff
K
ing
f
ix porta
b
ility pro
b
l
em
w
ith IS_RUN_
C
OMMA
N
D_ERR
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Stephen B
o
yd
f
o
r
m
at_s
a
nit
i
ze
d
_
subject: Don't trim pas
t
ini
t
ial length
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Chris Joh
n
s
e
n
D
ocumentation
:
use
"spu
r
i
ous
.
sp" XSLT if DOCBOOK_SUPPRES
S
_
S
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
J
ohan
n
e
s Schindelin
mailm
a
p
: r
e
surr
e
ct lower-cas
i
ng of email
a
d
dr
e
s
s
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Junio
C Hamano
Merge
g
i
t://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-04-01
Ali Ghola
m
i Rudi
builti
n
-c
l
on
e
.
c
:
n
o
need to strdup for setenv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Al
i
Gholami Rudi
bui
l
t
i
n-clone
.
c:
make junk_pid st
a
t
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C H
a
m
ano
Me
r
ge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
Ham
a
no
Upda
t
e
dra
f
t release notes to 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C Hamano
Mer
g
e branch '
m
aint-1
.
6
.
1
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-03-30
J
unio
C
H
amano
Merge
b
r
a
n
ch 'main
t
-1
.
6
.
0' into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Docume
n
tat
i
on:
push
.
defaul
t
applies
t
o all
r
emot
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
S
ant
i
B
éjar
D
o
cumentation:
e
nhance bra
n
ch
.
<
name>
.
{
r
emo
t
e,merge}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (a
k
a
.
.
.
Fix bash
c
ompl
e
tion
in path
w
ith s
p
aces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
bash co
m
pletion: only show
'log
--merge' if merging
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telmic
h
-
S
ch
o
t
.
.
.
git-ta
g
(1): add h
i
nt
about
c
om
m
it messag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Allan Caff
e
e
D
ocum
e
ntation: update graph
a
pi example
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C H
a
ma
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Ju
n
io C Hamano
Merge b
r
anch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
H
amano
Merge branch 'maint-1
.
6
.
0' into maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Jay Sof
f
ian
sen
d
-emai
l
: add test
s
for refa
c
tored prompting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffi
a
n
send
-
email: refact
o
r
a
nd ensure prompt
i
ng doesn't loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
gi
t
-svn:
f
ix ls-t
r
ee usage with dash-pr
e
fixed pa
t
hs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Johan
n
es Sch
i
nd
e
lin
import-zips: f
i
x thinko
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Er
i
k Faye-Lund
buil
t
in-fas
t
-expo
r
t
.
c: handl
e
nested tags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye
-
Lund
b
uiltin
-
fast-expo
r
t
.
c: fix c
r
ash on tagged trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
E
r
ik Faye-Lund
buil
t
i
n
-f
a
st-export
.
c:
t
urn error into warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
E
r
ik F
a
y
e-Lu
n
d
test-suite:
a
ddi
n
g a test
f
or fast-export with
tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Jun
i
o C Hamano
s
e
t_s
h
ared_perm(): so
m
et
i
mes we know what the final
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C
Hamano
m
ov
e
_
t
emp_
t
o_fi
l
e
(
): do not forg
e
t t
o
chmod() in "Coda
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2009-03-28
Junio
C
Hamano
U
pdate d
r
aft
release note
s
to
1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ha
m
ano
Merge branch 'jc/maint-1
.
6
.
0-d
i
ff-borro
w
-c
a
refu
l
ly'
commit
|
commitdiff
|
tree
2009-03-28
Jun
i
o C Hamano
M
e
rge branch 'js/remote-improvements'
commit
|
commitdiff
|
tree
2009-03-28
Junio C
H
amano
M
e
rge branc
h
'jk/clone-po
s
t-check
o
ut'
commit
|
commitdiff
|
tree
2009-03-28
J
u
n
io C Hamano
Merge branch 'maint-1
.
6
.
1' i
n
to main
t
commit
|
commitdiff
|
tree
2009-03-28
Emi
l
Sit
te
s
t-lib
:
Cl
e
an up
c
omm
e
nts and Makefile
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Michae
l
Hendricks
for
m
at-pat
c
h: add
a
rbitrary
e
mail headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
J
o
ha
n
H
e
rla
n
d
Move chmod
(
foo, 0444) into move_temp_to_file
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
"co
r
e
.
sharedrepo
s
itory
=
0mode" should set, n
o
t lo
o
sen
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next