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
git-mergetool: add new merge tool TortoiseMerge
2009-04-08
Ma
r
kus Heid
e
l
b
e
r
g
git-merge
t
ool: add new
merge tool TortoiseMerge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelbe
r
g
git-
m
e
rgetool/difftool: make (g)vimdiff worka
b
le
u
nder
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Ma
r
kus Heide
l
berg
d
o
c/
m
e
r
ge-config: list ecmerge as a built-in merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matth
i
e
u Moy
g
i
t-rev-
l
ist
.
t
xt: make ascii markup
uni
f
orm
w
ith other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-send
-
email
.
t
x
t
:
clarify w
h
ich
o
ption
s
take an
ar
g
ume
n
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Junio
C
Ham
a
no
Merg
e
b
ranch 'jc/nam
e
-b
r
a
n
c
h'
commit
|
commitdiff
|
tree
2009-04-06
Ju
n
io C
Hamano
Merge bran
c
h 'jc/shared-
l
i
t
era
l
ly'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Haman
o
Me
r
ge branch
'mg/tracked-local
-
branches'
commit
|
commitdiff
|
tree
2009-04-06
J
u
nio C Hamano
Merge branch 'sb/
f
ormat-patch-pat
c
hnam
e
'
commit
|
commitdiff
|
tree
2009-04-06
Felip
e
Contrer
a
s
user-manu
a
l: the name of the hash function is SH
A
-1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Cont
r
eras
docbook: cha
n
ge css
s
tyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Co
n
t
reras
user-manual: r
e
move some gi
t
-fo
o
us
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Santi Béj
a
r
Documentat
i
on: br
a
nch
.
*
.
merge c
a
n also affect 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Heik
o
Voigt
Add configuration varia
b
le for sig
n
-off
to format
-
patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Todd
Z
ullinger
bash completion: U
p
date 'git am' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C H
a
mano
Merge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2009-04-05
J
u
lien Danj
o
u
g
it su
b
module: fix usage
l
ine
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hama
n
o
Merge bra
n
ch 'ma
i
n
t-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-05
Jun
i
o
C
H
amano
Merg
e
branch '
m
aint-1
.
6
.
0
'
into m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Ma
r
ku
s
Heidelberg
doc/g
i
t-
p
ack-refs: fi
x
tw
o
grammar is
s
ues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Je
f
f Kin
g
tests: remove ex
i
t after test_done ca
l
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
commit: abort
c
om
m
it if
i
n
t
eracti
v
e ad
d
f
ailed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
C
hristian
C
ouder
bisec
t
: improve error message when branch
c
h
e
ckout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Dan
McGee
git-repack: use no
n
-dashed update-se
r
ver-i
n
fo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay So
f
fian
send
-
e
ma
i
l: fix n
a
sty bug in ask() function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Haman
o
Update dr
a
ft release note
s
to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
ano
Sync
w
ith 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Ham
a
no
GIT 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ham
a
no
Merge branch '
j
c/
m
a
int-1
.
6
.
0
-
blame
-
s' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
e
rge branch 'js/maint-diff-temp-smudge
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
e
rge branch 'js/main
t
-1
.
6
.
0-ex
e
c-pat
h
-env
'
into
m
aint
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Hamano
Merge branch
'
b
c/
m
aint-1
.
6
.
1-br
a
nch
-
d
eleted-
w
as' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge br
a
nch 'tr/maint-1
.
6
.
1-doc-format-pat
c
h--
r
o
ot
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Haman
o
Merge bra
n
c
h 'dm/
m
a
i
nt-docco' into maint
commit
|
commitdiff
|
tree
2009-04-02
J
a
y S
o
ffian
s
e
nd-email: ensu
r
e quoted ad
d
res
s
e
s
are rfc2
0
47 encoded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay S
o
ffi
a
n
send-email: co
r
re
c
t
two t
e
sts wh
i
ch wer
e
going
i
ntera
c
tive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Mer
g
e branc
h
'ef/f
a
st-export'
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
Me
r
ge branc
h
'
m
h
/
format
-
patch-add-h
e
ader'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge
bra
n
ch
'tr/maint-1
.
6
.
1
-
doc
-
forma
t
-patch--root'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C
Hamano
Merg
e
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'm
a
in
t
-1
.
6
.
1' into mai
n
t
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C
Hamano
M
erge bra
n
ch 'maint-1
.
6
.
0' int
o
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
J
u
ni
o
C Hamano
M
e
rge branch 'cj/do
c
-format'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hama
n
o
Me
r
g
e
branch 'jc/main
t
-1
.
6
.
0-keep-pack'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge br
a
nch 'kb
/
tracking-cou
n
t-no-merges'
commit
|
commitdiff
|
tree
2009-04-02
Wesl
e
y
J
.
Landaker
D
ocumentation: gi
t
-svn:
f
ix trunk/fetch svn-rem
o
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Björn St
e
inb
r
ink
Mailmap: Allow
e
mpty e
m
ai
l
ad
d
res
s
es to be mapped
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Mich
a
el J G
r
uber
M
ake local branches be
h
ave li
k
e remote bra
n
ches when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Heiko Vo
i
gt
Clea
n
up warni
n
g about known issues in cvsim
p
ort docu
m
entat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Holger Wei
ß
Documenta
t
io
n
: Remove an odd "instead"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-e
m
ail: ask_default should apply to all
emails
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-email: don'
t
at
t
empt t
o
prompt if t
t
y
is
c
l
osed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t1301: lo
o
sen
t
est
f
or forced modes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
e
f
f K
i
ng
fix portabili
t
y p
r
obl
e
m with IS
_
R
U
N_COMMAN
D
_ERR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Stephen Boyd
format_sanit
i
zed
_
s
u
bject: Don
'
t trim past
i
niti
a
l
le
n
gth
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Chris Joh
n
sen
D
ocum
e
ntation: use "spurious
.
sp" XSLT if D
O
CBOOK_SUPPR
E
SS_S
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Johannes Schindelin
mailmap:
r
e
surrect low
e
r-casing of email add
r
esses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Ju
n
io C Ha
m
ano
Me
r
ge git://git
.
bog
o
mips
.
org/git-sv
n
commit
|
commitdiff
|
tree
2009-04-01
Ali
G
h
olami Rudi
bu
i
ltin-clone
.
c:
no need to strdup for setenv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Ali
G
h
o
l
a
mi Rudi
builtin-clone
.
c: make
junk_pid
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Ju
n
io
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Ju
n
io C Hamano
Update draf
t
rele
a
se notes t
o
1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ham
a
no
Merge b
r
a
nch 'maint-1
.
6
.
1
' into m
a
int
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C
H
amano
Merg
e
bran
c
h 'maint-
1
.
6
.
0
' in
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
S
a
nti
Bé
j
ar
Document
a
t
i
on: pus
h
.
default
a
p
pl
i
es to all remotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Documentatio
n
: enha
n
ce branch
.
<name
>
.
{
remote,merge}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (aka
.
.
.
Fix bash c
o
mpleti
o
n
i
n path with spaces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
T
h
o
mas Rast
bash
completion
:
only sho
w
'
log --merge'
i
f
merging
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Ni
c
o -telm
i
ch- Schot
.
.
.
git
-
tag(1): add hint abo
u
t commit me
s
s
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
A
ll
a
n
Ca
f
f
ee
D
o
c
u
m
ent
a
tion:
update graph api example
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C
H
amano
Merge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2009-03-30
J
u
nio C H
a
mano
Merge branch '
m
ain
t
-1
.
6
.
1
'
in
t
o
m
ai
n
t
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge bran
c
h 'maint-1
.
6
.
0' into
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Jay
S
offia
n
send-email
:
a
d
d tests for
r
efactored prom
p
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Ja
y
Soffian
send-ema
i
l
: refa
c
tor
and ensure promptin
g
doesn't loop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
git
-
s
vn: fix ls
-
t
ree usage
wi
t
h dash
-
p
r
ef
i
xed
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Johannes
S
chindelin
import-z
i
ps:
fix think
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
buil
t
in-
f
ast-export
.
c: hand
l
e nested
tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
builtin-fast-export
.
c:
f
ix
cras
h
on tagge
d
tr
e
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
E
r
ik Faye-L
u
nd
builtin-fast
-
export
.
c: turn error into warni
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik F
a
ye-Lu
n
d
t
e
st-su
i
te: ad
d
ing
a
test
f
o
r fast-expor
t
with tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Jun
i
o
C Haman
o
set_shared_
p
e
rm(): sometimes we k
n
ow what the
final
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
move_t
e
mp_to_file(
)
: do not forget to chmod()
i
n "C
o
da
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-03-28
J
u
n
io C
H
am
a
n
o
Up
d
ate draft release
notes
t
o
1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
J
u
n
io C
Hamano
Me
r
ge bran
c
h
'jc/m
a
int-1
.
6
.
0-diff
-
b
orrow-car
e
f
u
lly'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Mer
g
e branch 'js/remote-improvements'
commit
|
commitdiff
|
tree
2009-03-28
Junio
C
Hamano
Merge bra
n
ch
'
j
k
/clone
-
p
o
st-che
c
kout'
commit
|
commitdiff
|
tree
2009-03-28
Jun
i
o C Ham
a
no
Merg
e
b
r
anch
'maint-1
.
6
.
1' into
m
aint
commit
|
commitdiff
|
tree
2009-03-28
Emil Sit
test-lib: Cle
a
n up comments and Makefi
l
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Michael
Hendricks
f
o
rmat-
p
atch:
ad
d
arbitrary emai
l
headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
M
o
v
e
ch
m
o
d
(foo, 044
4
) into
m
ove_temp_to_file
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
"co
r
e
.
sharedrep
o
s
i
to
r
y =
0mo
d
e
"
shoul
d
set,
n
ot loosen
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
M
i
chele Bal
l
abio
r
e
base
:
fi
x
typo (force_
r
ebas -> force-rebas)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Chr
i
stian Couder
log-tre
e
:
f
i
x
patch filen
a
me
computa
t
ion in "git format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Mic
h
ael J Gruber
T
est for loc
a
l
br
a
nches bei
n
g fol
l
o
w
ed with
--track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
T
homas Rast
D
ocum
e
ntation: fo
r
ma
t
-
p
atch --root cla
r
ific
a
tion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
J
unio C Hama
n
o
Merge
b
r
an
c
h
'cj/do
c
-quiet' into cj/
d
o
c-fo
r
mat
commit
|
commitdiff
|
tree
2009-03-27
Chris
J
oh
n
se
n
Documenta
t
ion: option t
o
render lit
e
r
a
l text
as
bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Chris
J
ohns
e
n
Documentation
:
a
s
ciid
o
c
.
con
f
: fix verse block
wit
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next