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: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
2009-04-08
D
avid
A
guilar
difftool: remove mer
g
e o
p
tions for opendiff,
tkdiff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
rkus Heidelber
g
git-merge
t
o
o
l: add n
e
w merge tool Tort
o
iseMer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Mar
k
us
H
eidelberg
git-mergetoo
l
/difft
o
ol: make
(
g
)
vimdiff workable un
d
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelber
g
doc/m
e
rge-confi
g
:
list ecmerge as a bu
i
l
t-i
n
merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
g
it-rev-lis
t
.
t
x
t: make ascii markup
uniform with o
t
her
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
t
thieu M
o
y
git-send
-
email
.
txt: clar
i
fy which
options
take an argument
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merg
e
b
r
anch 'jc/name
-
b
r
anch'
commit
|
commitdiff
|
tree
2009-04-06
J
u
n
io C H
a
m
ano
Merge
b
ranch '
j
c/shar
e
d-literally'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge b
r
anch 'mg/tracked-lo
c
al-b
r
anches'
commit
|
commitdiff
|
tree
2009-04-06
J
u
nio C Haman
o
Merge
branch 'sb/
f
ormat-
p
atch-patchname'
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contreras
user-manual: t
h
e name of the hash functi
o
n is SHA-1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contr
e
ras
docbook: change
c
s
s
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Fel
i
pe Contreras
user-manual:
remov
e
some
g
i
t
-foo usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
San
t
i Béjar
Doc
u
mentation: b
r
anch
.
*
.
merg
e
can also
affect
'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Heiko V
o
igt
Add configuration variable for sign-off to f
o
rm
a
t-patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Todd Zullinger
bash co
m
pletion:
Updat
e
'git am' option
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
J
u
nio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-05
Julien D
a
nj
o
u
git submodule
:
fi
x
usage li
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jun
i
o
C Hamano
Merge
branch 'maint
-
1
.
6
.
1
' into maint
commit
|
commitdiff
|
tree
2009-04-05
J
unio C Hamano
Merge branch 'maint-1
.
6
.
0
' into ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelber
g
doc/git-
p
ack-refs: fix two grammar iss
u
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
tests: remove e
x
it after tes
t
_done c
a
ll
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jef
f
King
commi
t
: abort com
m
it if inte
r
a
c
t
ive add failed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Cou
d
er
bisect: improv
e
error m
e
ssag
e
w
hen
b
ranc
h
c
heckout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Dan McGee
git-rep
a
ck
:
u
s
e non-d
a
s
h
ed upda
t
e-serv
e
r-info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
J
ay
S
offian
send-email:
fix
n
asty bug in a
s
k() fu
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hamano
Upda
t
e draft release
n
otes to
1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
Sync with
1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
G
IT
1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
u
ni
o
C Hamano
Merge branch 'jc/m
a
i
n
t-1
.
6
.
0-bl
a
me-s' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Me
r
ge branch 'js/maint-
d
iff-t
e
m
p
-smudge' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
Merg
e
branch 'j
s
/maint-1
.
6
.
0-exec-path-e
n
v' i
n
to maint
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C
Haman
o
Merge branch 'bc/maint-1
.
6
.
1-br
a
n
ch-deleted-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge
b
r
anch 'tr/maint-1
.
6
.
1-doc-format-patch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Ha
m
ano
Mer
g
e branch 'dm/maint
-
docco
'
int
o
maint
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffia
n
send-
e
mail: ensure quote
d
a
d
dresses
are rfc2047 encoded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send-email: correct
two tests
w
hic
h
wer
e
g
o
i
n
g intera
c
t
i
ve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C
Hama
n
o
Me
r
g
e branch 'ef/fast-export'
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o
C
Ham
a
no
Merge bran
c
h
'mh/fo
r
mat-
p
at
c
h-add-header'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch
'tr/maint-1
.
6
.
1-do
c
-format-pa
t
ch-
-
root'
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge bran
c
h 'm
a
in
t
'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
Mer
g
e b
r
anch '
m
aint-1
.
6
.
1' into main
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hama
n
o
M
er
g
e branch 'maint
-
1
.
6
.
0' into
mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
J
u
n
io
C Hamano
Merge br
a
n
c
h 'cj/doc-form
a
t'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge
b
ranch 'jc/maint-1
.
6
.
0-k
e
ep-pack'
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
i
o
C Hamano
Mer
g
e br
a
n
c
h
'kb/tra
c
kin
g
-co
u
nt
-
no-
m
erge
s
'
commit
|
commitdiff
|
tree
2009-04-02
Wesle
y
J
.
Landaker
Documentat
i
o
n
: git-s
v
n: fix tr
u
nk/fetch sv
n
-
r
emote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Björn Steinb
r
ink
Mailmap: Allow emp
t
y email addresses to
be
m
apped
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
M
ichael J Gruber
Make local
b
r
anches behave
l
ike remote
branc
h
es when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Heiko Voigt
Clean
u
p warnin
g
abou
t
known is
s
ues
in
cvsimport document
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Holger
Weiß
D
o
cumen
t
ati
o
n: Rem
o
ve
an odd "instead"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soff
i
an
send-email: a
s
k_default should app
l
y t
o
all emails
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soff
i
an
send-email: do
n
't at
t
e
mp
t
to prom
p
t if tty is closed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
eff King
t1301: loose
n
test fo
r
forced modes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix portabili
t
y problem with IS_RUN_COMM
A
ND_ERR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Stephen B
o
yd
f
o
rma
t
_sanitized_subject: Don't trim past initial
l
ength
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Chris Johnsen
Docu
m
enta
t
ion: use "spurious
.
sp" XSLT if D
O
C
B
O
O
K
_SUPPR
E
S
S
_
S
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Johannes Sc
h
indelin
mailmap: resurrect lowe
r
-casin
g
of
e
m
ail addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Junio
C Haman
o
Merge git:
/
/g
i
t
.
bogomips
.
org/git-
s
vn
commit
|
commitdiff
|
tree
2009-04-01
A
l
i
Gholami Rudi
builtin-clone
.
c: no need to strdup
for sete
n
v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Ali
Gholam
i
Ru
d
i
builtin
-
c
lone
.
c: ma
k
e ju
n
k_pid sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C
Ham
a
n
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
J
u
nio
C
Hamano
U
pdate dra
f
t r
e
lease note
s
to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ham
a
no
M
e
r
ge b
r
a
nch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Haman
o
Me
r
g
e
branch 'maint-1
.
6
.
0
' i
n
to maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi
Béjar
Doc
u
ment
a
tion:
p
ush
.
d
efault applies to
a
ll r
e
motes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Santi Bé
j
ar
Documentation: enhan
c
e branch
.
<name>
.
{remot
e
,merge}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Da
n
iel Cheng
(
a
ka
.
.
.
Fix
b
ash completi
o
n in path with spaces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Thom
a
s R
a
st
bas
h
completion: on
l
y show 'log
--merge' if mer
g
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Nico -te
l
m
i
c
h-
S
chot
.
.
.
g
it-ta
g
(1): add
h
int
a
bout commit mes
s
ages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Allan Caffee
Documentat
i
on: update
graph api example
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Ju
n
i
o
C Hamano
M
e
rge br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge bran
c
h
'mai
n
t-
1
.
6
.
1
'
int
o
m
aint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge branch 'ma
i
nt-1
.
6
.
0' in
t
o
m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffia
n
send-email: add tests
f
o
r
refactored prompt
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
J
a
y Soffia
n
send-email: refactor
a
nd ensure
pr
o
mpting
d
oesn't
l
oop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
g
i
t-svn: fix ls-tr
e
e usage with dash-p
r
efixed paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Joh
a
nnes Schindel
i
n
import-zips: fix thinko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Fa
y
e-L
u
n
d
b
u
iltin-
f
ast-
e
xpo
r
t
.
c
:
hand
l
e nest
e
d
t
ags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Fa
y
e-Lund
bui
l
t
in-fast
-
ex
p
ort
.
c: fi
x
crash on tagg
e
d
t
rees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
E
r
i
k
Fa
y
e-Lund
builtin-fast-export
.
c: turn error in
t
o
warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
test-suit
e
:
a
d
d
ing a te
s
t
for fast-expo
r
t with tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Juni
o
C Hamano
set_s
h
are
d
_perm(): someti
m
es w
e
know what the fin
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
move_te
m
p_to_file
(
): do not
f
orget
to chmod(
)
i
n "Co
d
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio
C
Hamano
Merge branc
h
'mai
n
t
'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Update draft
r
ele
a
se notes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ham
a
no
Mer
g
e bra
n
ch 'jc/maint
-
1
.
6
.
0-
d
iff
-
b
o
r
r
ow-carefu
l
ly'
commit
|
commitdiff
|
tree
2009-03-28
J
uni
o
C
Hamano
Merge branch 'js/rem
o
te-
i
mprovemen
t
s'
commit
|
commitdiff
|
tree
2009-03-28
Junio C
Ha
m
ano
Me
r
ge b
r
a
nch 'jk/clone
-
post
-
check
o
ut
'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ham
a
no
Mer
g
e branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-28
Emil Sit
test-lib: Clean
u
p comments and
M
akefile
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Michael Hend
r
icks
format-patch: add a
r
bitrary email headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
Move c
h
mod(foo, 0444) into move_temp_to_file
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Ham
a
no
"core
.
shar
e
dreposit
o
ry =
0mod
e
" s
h
ould set,
n
ot
l
oos
e
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Miche
l
e Ballabio
rebase: fi
x
typo (
f
orce_
r
e
ba
s
-> for
c
e-rebas)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
C
h
r
is
t
ia
n
C
ouder
log-tree: fix patch filename computation in "g
i
t format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Mic
h
ael J G
r
uber
Test for local br
a
nc
h
es being
followed with --track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Thomas Rast
D
ocumentation: f
o
rmat-patch --root
clarifi
c
ations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Junio C H
a
mano
Merge
b
ranch 'cj/d
o
c-quiet
'
i
nt
o
cj/doc-format
commit
|
commitdiff
|
tree
2009-03-27
Chris Johnsen
D
o
cument
a
t
i
on
:
opt
i
on to r
e
nde
r
li
t
eral text as bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next