repo.or.cz
/
git.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
Markus Heidel
b
erg
git-mergetool: a
d
d ne
w
merge tool To
r
toiseMerge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelbe
r
g
g
i
t-mergetool/difftool: make (g)vimdiff
w
o
r
kabl
e
under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
r
kus Hei
d
e
l
berg
doc/merge-config:
l
ist ecmerge as
a
built-in merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu
Moy
g
i
t-r
e
v-lis
t
.
t
x
t: ma
k
e
ascii ma
r
k
u
p unif
o
r
m
wit
h
other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
g
it-send-e
m
a
il
.
txt: clarify w
h
ic
h
options
tak
e
an
argu
m
ent
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge branch 'j
c
/name-b
r
a
n
ch'
commit
|
commitdiff
|
tree
2009-04-06
Junio C H
a
man
o
M
erge branch 'jc/sh
a
red-
l
iterally'
commit
|
commitdiff
|
tree
2009-04-06
Juni
o
C Hama
n
o
Merge branch 'mg
/
tracked-local-bran
c
hes'
commit
|
commitdiff
|
tree
2009-04-06
Ju
n
io C Haman
o
Merge branch 'sb/f
o
rm
a
t-patch-patch
n
am
e
'
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contreras
us
e
r-manual: the n
a
me of
the
h
a
sh function
is SHA
-
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contreras
docb
o
ok
:
change css style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Co
n
treras
u
ser-manual
:
remove some g
i
t-foo usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Sant
i
Béjar
Docu
m
entati
o
n:
b
r
an
c
h
.
*
.
merge ca
n
also
a
f
f
ect 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Voi
g
t
Add configuration variable
for sign-o
f
f to fo
r
mat-pa
t
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
T
odd
Z
u
llinger
bash compl
e
tio
n
:
Updat
e
'gi
t
am' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio
C
Ha
m
ano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-04-05
J
u
li
e
n
Danjou
git submodule: fix
usage
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C H
a
ma
n
o
Merge branch
'm
a
int-1
.
6
.
1' into
m
ai
n
t
commit
|
commitdiff
|
tree
2009-04-05
Juni
o
C Haman
o
Me
r
g
e branch 'm
a
int-1
.
6
.
0' into maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Marku
s
Heidelberg
doc
/
git-pack-r
e
fs: fi
x
t
w
o
grammar issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
tests: remove exit a
f
ter test_done call
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
com
m
it: abort commit if inte
r
active add
failed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Ch
r
istian Couder
bisect
:
improve error mess
a
ge
when branch checkout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
D
an McGee
gi
t
-repack: us
e
non-d
a
s
hed update-ser
v
er-info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay
Soffian
se
n
d-email: fix nasty bu
g
in ask() fu
n
c
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Upda
t
e d
r
aft
release notes
t
o
1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Ha
m
an
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
Hamano
GIT 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Haman
o
Me
r
ge br
a
nch
'jc/m
a
int-1
.
6
.
0-blam
e
-s'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Haman
o
Me
r
ge bra
n
ch 'js/mai
n
t-di
f
f
-
t
e
mp-smudg
e
' into maint
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
Hamano
Me
r
ge
branch 'bc
/
maint-1
.
6
.
1
-branc
h
-deleted-was'
int
o
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
Merge branch
't
r
/maint-1
.
6
.
1-doc-format-patch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C
H
amano
Merge branch
'dm/maint-doc
c
o' into maint
commit
|
commitdiff
|
tree
2009-04-02
Jay Sof
f
ian
send-email:
en
s
ure quoted
addresse
s
are rfc2
0
47 enc
o
ded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay So
f
fian
send-e
m
a
il: correct
t
wo t
e
sts which w
e
re going
i
nteractive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge
b
ranch 'ef/fast-export'
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
i
o
C Hamano
Merge
b
ra
n
ch 'mh
/
f
o
r
mat-patch-add-
h
e
ader'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hama
n
o
Merge branch 'tr/maint-
1
.
6
.
1-doc-format-patch--root'
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge b
r
anch
'
maint
'
commit
|
commitdiff
|
tree
2009-04-02
J
u
n
io C
Hamano
M
erge br
a
nch 'maint-1
.
6
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
ano
Merge br
a
nch 'maint-1
.
6
.
0'
i
nto maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Junio C Haman
o
Merge
br
a
nch 'cj/do
c
-format'
commit
|
commitdiff
|
tree
2009-04-02
J
u
n
io C
Ha
m
ano
Merge branch 'jc/m
a
int-1
.
6
.
0-keep
-
pack'
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Hamano
Me
r
ge b
r
anch
'
k
b/trac
k
ing
-
count-no-merges'
commit
|
commitdiff
|
tree
2009-04-02
Wesley
J
.
L
andaker
Document
a
tion: git
-
svn: fix trunk/f
e
tch svn-remot
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Björn
S
teinb
r
ink
Mailmap: Allow empty em
a
il addresses to be mapped
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Michael J Gruber
Make local branches behave like remote branches w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Heiko V
o
igt
C
l
eanup wa
r
ning ab
o
u
t
known is
s
ues i
n
cvsi
m
port d
o
cumentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Holg
e
r Weiß
Docum
e
ntation:
Remove an odd "inst
e
ad"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay
S
o
f
fian
s
end-ema
i
l: ask_d
e
fault should
a
pply to all email
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
a
y S
o
ff
i
an
send-e
m
ail: don't at
t
em
p
t to prompt if t
t
y
is closed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t1301: lo
o
sen test for for
c
ed modes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff Ki
n
g
fix
p
o
rtab
i
lity problem with IS_RUN_COMMA
N
D_ERR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Stephen
Boyd
f
o
rmat_sanitized
_
sub
j
ect
:
Don't trim
p
a
st initial length
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Chris J
o
h
n
sen
D
o
cumentation: us
e
"spurious
.
sp" XSLT if DOCBOOK_SUPPRESS_S
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Johannes Schinde
l
in
ma
i
lmap:
re
s
urrect lower-casing of email addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Juni
o
C Hamano
Merge git://git
.
bog
o
mips
.
org
/
git-svn
commit
|
commitdiff
|
tree
2009-04-01
Ali
G
holami Rudi
b
uiltin-clone
.
c: n
o
nee
d
to s
t
rdup for setenv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Al
i
G
h
olami Rudi
builtin-
c
lone
.
c: ma
k
e junk_pid
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Update dr
a
ft
r
elease notes to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Me
r
ge branch 'maint
-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge branch 'main
t
-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
S
anti Bé
j
a
r
D
ocumentation: push
.
def
a
u
l
t ap
p
lies
to
a
ll
r
emo
t
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
S
a
n
ti
Béjar
Do
c
umenta
t
ion: enhan
c
e branch
.
<na
m
e>
.
{
remote,merge}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (aka
.
.
.
Fix
bash co
m
pletion in path
w
ith spac
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Th
o
m
as Rast
bash
completion: o
n
ly sho
w
'log -
-
merge
'
if merging
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Nic
o
-telmich- Scho
t
.
.
.
git
-
t
a
g(
1
): add hint about commit
m
e
s
s
ages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Allan Caffe
e
Documentat
i
on:
update grap
h
ap
i
example
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C
Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-03-30
Junio
C Hamano
M
er
g
e branch '
m
a
int-1
.
6
.
1'
into mai
n
t
commit
|
commitdiff
|
tree
2009-03-30
J
u
nio C
H
a
mano
Merge branch 'maint-1
.
6
.
0'
i
nto maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Jay Soff
i
an
s
en
d
-email: add tests fo
r
ref
a
ctored p
r
ompting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffia
n
send-ema
i
l: refactor and ensure prompting doesn't loop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eric
W
ong
git-
s
v
n: fix ls-tree usage w
i
th dash-p
r
efixed paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Joh
a
n
n
es
Schindelin
i
mport-zips: fix thinko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
E
r
i
k
Faye-Lun
d
builtin-fa
s
t
-export
.
c:
h
andle nested tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
builtin-fast-export
.
c: fix crash on tag
g
ed
tre
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
E
r
ik Faye-L
u
nd
builti
n
-fas
t
-
export
.
c: turn error
i
nto warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
E
r
ik Faye-Lund
test-s
u
ite: adding a t
e
st for fast
-
export with ta
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
set_
s
ha
r
ed_p
e
rm(
)
: som
e
t
i
mes we k
n
ow what the fi
n
al
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
J
u
n
io C
H
amano
m
ove
_
temp_to_file():
d
o n
o
t
f
orget
to chmod() in
"
C
oda
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C H
a
man
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ham
a
no
Update dr
a
ft release notes
t
o 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge branc
h
'jc/maint-1
.
6
.
0-dif
f
-borrow-ca
r
efully'
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
io
C
H
aman
o
M
erge bran
c
h 'js/remote-
i
mprov
e
ments'
commit
|
commitdiff
|
tree
2009-03-28
Junio
C Hamano
M
e
rge branch 'jk/clo
n
e-post-c
h
eck
o
u
t
'
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
io C Hamano
M
erge
b
ranch 'maint-1
.
6
.
1'
i
n
to
main
t
commit
|
commitdiff
|
tree
2009-03-28
Emil Sit
tes
t
-lib: Cl
e
an up comments and Makefile
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Mich
a
el Hendric
k
s
format-pa
t
ch: add arb
i
trary
e
mail headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
J
oha
n
H
e
r
l
an
d
Move c
h
mod(fo
o
, 0444) into
m
ove_temp_
t
o_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
"core
.
sharedr
e
po
s
itory
=
0mode" should set, n
o
t loosen
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Michele Ballabio
rebase:
fix typo (f
o
rce
_
reba
s
-
> force-re
b
as)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Chri
s
ti
a
n
Couder
l
o
g
-
tree:
f
i
x
patch fil
e
name comput
a
t
ion in "git format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Michael
J
Gruber
Test
for
l
o
c
al br
a
nches being follo
w
ed with
--track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Th
o
mas Rast
Documentation: forma
t
-pat
c
h
-
-
root clarificat
i
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Junio C Haman
o
Merge
b
ranch 'cj/doc-q
u
iet'
into cj/do
c
-format
commit
|
commitdiff
|
tree
2009-03-27
Ch
r
is J
o
hnsen
D
o
cument
a
t
ion: option to
render literal
text as bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Chris
J
ohnsen
D
o
c
umentation
:
asc
i
idoc
.
conf: fix
verse block with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next