repo.or.cz
/
git
/
gitweb.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 Heidelber
g
git-mergetool: add new me
r
ge tool T
o
rt
o
iseMerge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
rkus Heidelber
g
git-
m
ergetool/
d
ifftool: make (g)vimdiff wo
r
kab
l
e un
d
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
rkus Heidelberg
doc/merge-confi
g
: list ecme
r
ge as a bui
l
t-in merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-rev-list
.
t
xt:
make ascii markup uni
f
orm with other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Mat
t
hi
e
u Mo
y
git-send-email
.
t
x
t:
c
lari
f
y
w
hic
h
options
t
a
k
e
an argument
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge branch
'
j
c/na
m
e
-bra
n
ch'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Haman
o
Merge branch
'
jc/sha
r
ed-literally'
commit
|
commitdiff
|
tree
2009-04-06
J
u
n
io C Hamano
M
e
r
g
e branch 'mg
/
trac
k
e
d-local-bran
c
hes'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge branch 'sb/f
o
rmat-patch-patchname'
commit
|
commitdiff
|
tree
2009-04-06
Felipe Con
t
r
e
ras
user-manual: the name
o
f the hash function is SHA-1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Cont
r
eras
docbook:
ch
a
n
g
e css sty
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Fel
i
pe Contrera
s
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
Documentation: branch
.
*
.
merge
can als
o
affect 'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Heik
o
Voigt
Add co
n
figuration va
r
iable for sign-off to for
m
at-
p
at
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Todd Zullinger
bash
c
o
mp
l
etion:
Update 'git am' opti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-04-05
Juli
e
n Danjou
g
i
t
submodule: fix
u
sa
g
e line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio
C
Ha
m
ano
M
e
rge branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merge branch '
m
a
in
t
-1
.
6
.
0'
int
o
m
ai
n
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Mar
k
us Heidelberg
doc/git-pack-ref
s
: f
i
x two grammar issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff
King
test
s
: remove exit a
f
te
r
test_done call
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
co
m
mit
:
abort commit if
i
nteractiv
e
add failed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Chris
t
ian Couder
bisect: improve
e
rror
m
essage
w
hen branch
check
o
ut
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
D
an McGee
gi
t
-
repack:
u
se n
o
n-dashed
u
p
date-server-
i
nfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffian
sen
d
-e
m
ail: fix n
a
sty bug in ask() functio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C
Hamano
U
p
d
a
t
e
draft release notes to 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Ham
a
no
S
ync with
1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C
H
a
man
o
GIT
1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge bra
n
c
h 'jc/mai
n
t-1
.
6
.
0-blam
e
-s' int
o
maint
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Hamano
Me
r
ge branch
'
js/maint-diff-t
e
m
p
-smudg
e
' i
n
to maint
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Hamano
M
e
r
ge bra
n
c
h
'js/maint-1
.
6
.
0
-
exe
c
-path-env' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Ha
m
ano
Merge branch 'b
c
/maint-1
.
6
.
1-branch-del
e
ted-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Hamano
M
e
rge branch 'tr/m
a
i
n
t-1
.
6
.
1-doc-
f
ormat-patch-
-
root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Ham
a
no
Merge branch 'dm/maint-docco' into maint
commit
|
commitdiff
|
tree
2009-04-02
Ja
y
Soffian
send-e
m
ail: e
n
s
u
re quoted
a
ddresses ar
e
rfc2047
encoded
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send-email: correct
tw
o
tests whic
h
wer
e
going interactive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merg
e
branch 'e
f
/fast-expo
r
t
'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ham
a
no
Merge br
a
nch 'm
h
/format-pa
t
ch-add-heade
r
'
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
i
o
C Hama
n
o
M
erg
e
branch 'tr/m
a
int-1
.
6
.
1-
d
oc-format-patch-
-
root'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
ma
n
o
Merge b
r
anch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ham
a
no
Merge
bra
n
ch 'maint-
1
.
6
.
0' into m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hama
n
o
Merg
e
b
r
anch 'cj/doc-format'
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
Merge branch 'jc/m
a
int-
1
.
6
.
0-
k
eep-pack'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ham
a
no
Merge branch
'kb/
t
racking-cou
n
t-no-m
e
rges'
commit
|
commitdiff
|
tree
2009-04-02
We
s
ley J
.
Landaker
Doc
u
mentation: git-svn: fix trunk
/
f
etch
s
v
n-remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Björn Steinbrink
Mailmap
:
Allow
e
mpty email a
d
dress
e
s t
o
be map
p
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Michael
J Gr
u
ber
Make lo
c
al b
r
anches
b
eh
a
ve lik
e
remote
b
ra
n
ches when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
He
i
ko Voig
t
Cleanup warning about known issues in cvsimpor
t
docu
m
entati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Holg
e
r W
e
iß
Do
c
umenta
t
ion: 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
send-email:
ask_de
f
a
ult should appl
y
to
all em
a
ils
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
J
a
y So
f
f
i
an
sen
d
-email:
don't atte
m
pt to
p
romp
t
if tty i
s
closed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t1301
:
lo
o
sen
t
es
t
f
o
r f
o
r
ced modes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix
p
ortability
p
ro
b
le
m
with
IS
_
R
U
N
_COM
M
AND_ER
R
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
S
t
e
p
h
en
B
o
y
d
format_sanitized_subject: Don
'
t trim past i
n
it
i
al length
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Chris Johnsen
Document
a
tion: use "spurious
.
sp" XSLT if DOCBOOK_SUPPRESS_S
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Johannes
Sc
h
indeli
n
mailmap: resurrect lower-casing of email
addre
s
ses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Junio C Haman
o
Merge git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-04-01
Ali
Ghol
a
mi Rudi
builtin-clone
.
c: no need
to strdup for se
t
env
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami Rudi
b
u
iltin-clone
.
c
:
m
a
ke
j
u
nk_pid static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ham
a
no
M
e
rg
e
bran
c
h
'maint'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Update draft release
notes to
1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
J
unio
C
Hamano
Me
r
ge branch 'maint
-
1
.
6
.
1' i
n
to maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Haman
o
Merge
b
ranch 'ma
i
nt
-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi Béj
a
r
D
oc
u
m
entati
o
n:
p
ush
.
default applie
s
to all remot
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Santi Béja
r
D
o
cumentation
:
enh
a
nc
e
branch
.
<name>
.
{
r
emot
e
,merge}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (a
k
a
.
.
.
Fix
b
ash completion in path wi
t
h
spaces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Th
o
mas Rast
bash complet
i
on: only sho
w
'log --merge' if
me
r
ging
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
N
i
co
-
t
elmich- Schot
.
.
.
g
i
t-tag(1): add
h
int about commi
t
mes
s
ages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
All
a
n
C
affee
Document
a
tion: update gr
a
ph api exam
p
le
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2009-03-30
Ju
n
io C Hamano
Merg
e
b
r
anch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge
b
r
a
nch
'
main
t
-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
J
a
y Soffian
sen
d
-ema
i
l: add tests for ref
a
ctored prompting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
J
a
y So
f
fian
send-email: refacto
r
and ensure promp
t
ing
d
o
esn't loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
git-svn: fix l
s
-tr
e
e
us
a
ge with dash-pre
f
ixed paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Johannes Schin
d
el
i
n
impo
r
t
-zips
:
fix
t
hink
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
E
r
ik Faye-
L
und
bui
l
ti
n
-fas
t
-
e
xport
.
c: handl
e
nest
e
d tags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
builtin-fast-e
x
po
r
t
.
c: fix
crash on tagged trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
built
i
n
-
fast-export
.
c
:
turn
error
i
nto warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Er
i
k
Faye-Lund
t
e
st-su
i
te:
adding a
test for fast-export w
i
th
t
ag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hama
n
o
set_shar
e
d_per
m
(
): sometim
e
s we know w
h
at the fina
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
i
o C Hamano
move_t
e
mp_to_file()
:
do not forget to chmod() in "C
o
da
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
U
pda
t
e
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
Merge branch 'jc/ma
i
nt-1
.
6
.
0
-diff-borr
o
w
-carefully
'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hama
n
o
Mer
g
e
branch 'js/r
e
mo
t
e-impr
o
v
e
me
n
ts'
commit
|
commitdiff
|
tree
2009-03-28
Juni
o
C
H
aman
o
Merge
bra
n
ch 'jk/clo
n
e-post-checkout'
commit
|
commitdiff
|
tree
2009-03-28
J
unio C Hamano
M
erge
branch 'mai
n
t-1
.
6
.
1' into
m
aint
commit
|
commitdiff
|
tree
2009-03-28
Em
i
l Sit
test-lib: Clea
n
up comme
n
ts
a
nd Makefile
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Micha
e
l Hendricks
fo
r
mat-
p
a
tch: ad
d
ar
b
itrar
y
email h
e
aders
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Johan H
e
rla
n
d
M
o
v
e chmod(foo, 04
4
4) i
n
to move_temp_to_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C
H
a
mano
"
c
ore
.
shar
e
dreposit
o
ry = 0mode" should set, not loosen
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Mich
e
le Ballabio
r
ebase: fix typo (force_rebas -
>
force-rebas)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Chr
i
st
i
a
n
C
o
uder
log-tree: fix
patch filen
a
me c
o
mputatio
n
i
n "git format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Mich
a
el J Grub
e
r
Test for local branches being follow
e
d with -
-
tra
c
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Thom
a
s Rast
Doc
u
mentation:
format
-
patch --root clari
f
i
c
a
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Ju
n
io C Hamano
Merge branch 'cj/doc-q
u
i
et' i
n
to cj/doc-format
commit
|
commitdiff
|
tree
2009-03-27
Chris Johnsen
Docu
m
e
n
ta
t
i
o
n: option
t
o r
e
nde
r
literal text as bold
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Chris
Johnsen
Document
a
t
ion: asciido
c
.
conf: fix
verse block with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next