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
difftool/mergetool: refactor commands to use git-mergetool--lib
2009-04-08
D
a
v
i
d
A
guilar
d
i
fft
o
o
l/m
e
rgetoo
l
: refactor command
s
to use g
i
t-mergetool
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
mergetool:
use $(
.
.
.
) i
n
ste
a
d of `
b
acktick
s
`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completion: add
gi
t
-
di
f
f
t
ool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
g
uila
r
d
ifft
o
ol: add suppor
t
for
a
difftoo
l
.
prompt
c
o
n
fig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftoo
l
: add
v
ar
i
ous git-difftool te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: move '
g
it-d
i
fft
o
ol' out of co
n
trib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Seb
a
stian Pi
p
ping
diff
t
ool/mergetool: add diffuse as
m
erge and d
i
ff tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool: add a -y shortcut f
o
r --no-pr
o
mpt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
a
r
difftool: us
e
perl built-ins when testing for msys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
la
r
difftoo
l
:
re
m
ove th
e
ba
c
kup file fe
a
t
u
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
Aguilar
difftool:
r
emove merge options
for opendiff,
tkdiff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
r
ku
s
H
ei
d
elberg
git
-
mergetool: add n
e
w
merge
tool TortoiseMerg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Mark
u
s
Hei
d
elber
g
git-mer
g
eto
o
l
/
d
i
ffto
o
l: make (g
)
vimdiff
w
orkable under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Ma
r
kus Heidelberg
doc/merge-config: l
i
st ecmerge as a built-in m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu
Moy
g
i
t
-rev-lis
t
.
txt: make ascii
mark
u
p un
i
form w
i
th oth
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
g
it-send-ema
i
l
.
t
xt: clar
i
f
y wh
i
ch o
p
tions ta
k
e an argument
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Ju
n
io C Hamano
Merge branch '
j
c/name-b
r
a
n
ch'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hama
n
o
M
e
rge br
a
nch 'jc/shared-literally
'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge branch 'mg/
t
r
acked-local-branche
s
'
commit
|
commitdiff
|
tree
2009-04-06
J
unio C Hamano
Merge
b
ranch
'
sb/
f
orm
a
t-p
a
t
ch
-
patchnam
e
'
commit
|
commitdiff
|
tree
2009-04-06
Felip
e
Contr
e
ras
user-manual: the name of
t
he h
a
sh funct
i
on
i
s S
H
A-1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Cont
r
er
a
s
d
ocbook: change cs
s
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
F
elipe Con
t
reras
u
s
er-manual:
remove so
m
e git
-
foo usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Santi
B
é
j
a
r
D
o
c
umentat
i
o
n
: branc
h
.
*
.
merge can also af
f
ect 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Voigt
A
dd configuration variable for sign-off to
format-p
a
tc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Todd
Z
ullinger
bash
c
ompletion:
Update 'git am' optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio
C
Haman
o
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2009-04-05
Jul
i
en Danj
o
u
git submodul
e
: fi
x
usage line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
M
erge b
r
a
n
ch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-05
Ju
n
io C Ham
a
no
Me
r
ge b
r
anch 'maint-1
.
6
.
0' i
n
t
o
m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
M
a
rkus He
i
delb
e
rg
d
o
c/git
-
pack-r
e
f
s: fix
t
wo grammar is
s
ues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff
Ki
n
g
te
s
ts: remove exit after tes
t
_done c
a
ll
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff K
i
ng
commi
t
: abort commit if interactive add
failed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Cou
d
er
bis
e
ct: improv
e
error mes
s
age when
branch checko
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Da
n
Mc
G
ee
g
it-rep
a
c
k: use non-dashed update-s
e
rver
-
info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffian
send-email: fix n
a
s
ty bug i
n
ask() function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Haman
o
Up
d
ate draft rele
a
se notes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
uni
o
C H
a
m
a
n
o
Sync with
1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
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
M
erge branch 'jc/maint-1
.
6
.
0-
b
lame-s' into m
a
int
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
Merge branch
'js/maint-diff-temp-smudge'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
erge branch 'js/maint-1
.
6
.
0
-exec-path-env' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge b
r
anch 'bc/maint-
1
.
6
.
1-branch-delet
e
d-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C
H
amano
Merg
e
branch
'
tr/maint-1
.
6
.
1-do
c
-format-p
a
tch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C
H
amano
Merg
e
branch 'dm/maint-do
c
co' int
o
maint
commit
|
commitdiff
|
tree
2009-04-02
Jay
S
offian
send-em
a
il: ensure
q
uoted a
d
dresses are rfc2047 encoded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay S
o
ffian
send-email: correct two tests which were goi
n
g i
n
t
era
c
t
iv
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C
H
a
m
ano
M
e
rge branch 'ef/f
a
st-ex
p
ort'
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
M
erge
br
a
nc
h
'm
h
/format-patch-add-heade
r
'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branc
h
'tr/maint
-
1
.
6
.
1-doc-format
-
p
a
tch--root'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
Merge branch '
m
aint
'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C H
a
mano
Merge br
a
nch 'main
t
-1
.
6
.
1' into m
a
int
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge branch 'maint-1
.
6
.
0'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Ham
a
n
o
Me
r
ge branch 'cj/do
c
-format'
commit
|
commitdiff
|
tree
2009-04-02
Junio C
H
am
a
n
o
Merge branch 'jc/maint-1
.
6
.
0-keep-
p
ack'
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Hamano
Merge branch
'
kb/tracking-count-no-merges'
commit
|
commitdiff
|
tree
2009-04-02
Wesley J
.
L
andaker
Doc
u
men
t
at
i
on: git-svn: fix trunk
/
fetch svn-remo
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Björn S
t
e
i
nbrink
Mailmap: Al
l
ow empty
email
a
d
dresses to
be mapped
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Mich
a
el J Gruber
Make
local branches
b
e
h
a
v
e
l
i
ke remote br
a
nches when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Heiko Voigt
C
leanup warni
n
g a
b
out known
i
s
s
u
e
s in cvsimport documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Holger
W
eiß
Documentation: Remove an odd "instead"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
s
e
nd-
e
mail: as
k
_default
s
h
ould apply to
all emails
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffi
a
n
send-email: don't attemp
t
to prompt i
f
tty is
c
losed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t1301: loosen test f
o
r
f
orced
modes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix portabili
t
y probl
e
m with
IS_RUN_COMMA
N
D_ERR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Stephen Boyd
fo
r
mat
_
sanitized_su
b
jec
t
: Don't
trim
p
ast initi
a
l
length
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Ch
r
is
J
ohns
e
n
Documentation: use
"s
p
urious
.
s
p
" XSL
T
if DOC
B
O
O
K_SUP
P
R
E
SS_S
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Johan
n
es
S
chind
e
lin
m
a
ilmap:
r
esurrect lo
w
er-casing of email addr
e
sses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Junio C Haman
o
Merg
e
git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami R
u
d
i
builtin-clone
.
c: no n
e
ed to st
r
du
p
for setenv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami
Rudi
buil
t
in-clon
e
.
c: make j
u
nk_pid s
t
at
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C Hamano
Mer
g
e bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
H
a
m
ano
U
p
dat
e
draft release notes to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge bra
n
ch '
m
a
i
nt-1
.
6
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2009-03-30
J
u
nio C Hamano
Merge b
r
anc
h
'ma
i
n
t
-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Sa
n
ti
Béjar
Documentation: pu
s
h
.
default ap
p
lies to all remo
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Santi
B
éjar
Doc
u
m
e
ntation:
enh
a
nce branch
.
<name>
.
{remot
e
,merge}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng
(
aka
.
.
.
Fix bash completion in path
w
i
t
h space
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Tho
m
a
s
Rast
bash comp
l
etion: only s
h
ow 'l
o
g --me
r
g
e
' if mer
g
in
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telmich- Schot
.
.
.
git-tag(1): a
d
d
hi
n
t
abou
t
c
o
m
m
it mess
a
ge
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Allan C
a
ff
e
e
Documen
t
ation: up
d
a
te graph api example
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merg
e
br
a
nch
'maint
'
commit
|
commitdiff
|
tree
2009-03-30
J
unio C Haman
o
Merge bran
c
h
'main
t
-1
.
6
.
1' into
maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hama
n
o
Merge
bra
n
c
h
'maint-1
.
6
.
0'
i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Jay
So
f
fian
send-email: ad
d
t
est
s
f
o
r refactore
d
pro
m
pting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffian
send-email: re
f
actor and en
s
ure promp
t
ing doesn't loop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
git-svn: fix ls-
t
ree u
s
a
ge wi
t
h dash-pr
e
fixed paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Joh
a
n
nes Schindelin
import-
z
ips: fix thinko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik
Faye-Lund
builtin-fast-
e
xpor
t
.
c: h
a
ndle
nested tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik F
a
ye-
L
u
n
d
builtin-fast-
e
xport
.
c: fix cra
s
h
o
n
t
agged trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
builtin-fast-ex
p
o
rt
.
c: turn error into warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
te
s
t-suite: add
i
n
g
a test fo
r
fast
-
ex
p
ort with tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
io C Hamano
se
t
_sha
r
ed_pe
r
m
(): s
o
meti
m
es we k
n
ow w
h
at
t
he final
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
io C
H
amano
move_te
m
p_to_file(): do no
t
forget
to
chmod()
in
"
C
o
da
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Haman
o
M
e
r
g
e b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2009-03-28
J
un
i
o C
H
amano
U
p
date
d
raft relea
s
e
n
otes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Juni
o
C Ham
a
n
o
Merge branch 'jc/
m
aint-1
.
6
.
0-diff-bor
r
ow-carefully'
commit
|
commitdiff
|
tree
2009-03-28
J
unio
C
Ha
m
ano
Merge b
r
anch 'js/
r
emote-improveme
n
t
s
'
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
io
C
Hamano
Merge branch '
j
k
/
clone
-
post
-
che
c
kout'
commit
|
commitdiff
|
tree
2009-03-28
Jun
i
o
C
H
a
man
o
Merge
branch 'maint-1
.
6
.
1' into
maint
commit
|
commitdiff
|
tree
next