repo.or.cz
/
git
/
mingw
/
j6t.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
David A
g
u
i
l
a
r
d
i
fftool/mergetool: refactor
c
ommands to
use git-mergetool
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
mergetool: use $(
.
.
.
) ins
t
ead of
`backt
i
ck
s
`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completion:
a
dd
git-difftool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Ag
u
i
l
ar
d
ifftool:
add su
p
po
r
t
f
or
a
difftool
.
prompt config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
a
d
d
various git-difftool test
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool:
m
ov
e
'git-di
f
ft
o
ol
'
out of contrib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Sebastian Pi
p
ping
difft
o
ol/merget
o
ol: add diffu
s
e as m
e
rge and diff tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add a -y
shortcu
t
for --no-pr
o
m
p
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
diffto
o
l: use perl built-ins when
t
estin
g
f
o
r msys
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
r
emove the
backup f
i
le feature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftoo
l
:
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
k
us He
i
delbe
r
g
git-mergetool: add
new
merge tool Tor
t
o
iseMerg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
rkus H
e
idelberg
git
-
mer
g
etool/dif
f
to
o
l:
m
a
k
e (g)v
i
m
d
iff wo
r
kabl
e
under
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
arkus Heidelbe
r
g
doc/me
r
ge-con
f
i
g: list ecmerge
a
s
a
b
uilt-in m
e
rge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
tthieu M
o
y
g
it-rev-li
s
t
.
txt: ma
k
e ascii mark
u
p uniform with
other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
thieu Moy
git-se
n
d-email
.
txt: clarify wh
i
ch options t
a
ke
an
argument
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge branch
'jc/name-
b
ranch
'
commit
|
commitdiff
|
tree
2009-04-06
J
unio C Hamano
Merge b
r
anch
'
jc/s
h
ared
-
l
i
terall
y
'
commit
|
commitdiff
|
tree
2009-04-06
Jun
i
o
C Hamano
Me
r
ge b
r
anch 'mg/tracked-local-
b
ranche
s
'
commit
|
commitdiff
|
tree
2009-04-06
Junio C H
a
mano
Merge
b
ranch 'sb/fo
r
mat-patch-p
a
tchname'
commit
|
commitdiff
|
tree
2009-04-06
Felipe Co
n
treras
us
e
r-m
a
nual: the name of the hash function
i
s SHA-1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
F
elipe Contrera
s
doc
b
ook:
c
ha
n
ge css style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contr
e
ras
user-
m
anu
a
l: rem
o
ve some git-fo
o
usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Sant
i
Béjar
Docu
m
entation: branch
.
*
.
merg
e
can also af
f
ec
t
'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Voig
t
Add
c
onfigura
t
ion variable
for
sign
-
off to format-p
a
tch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
T
odd Zulling
e
r
bash comp
l
etio
n
: Update 'gi
t
am' options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
J
unio C Hamano
Mer
g
e branc
h
'maint'
commit
|
commitdiff
|
tree
2009-04-05
Julien Danj
o
u
git sub
m
odule: fix usage
line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Ha
m
a
n
o
Merge branch
'
m
a
i
nt-1
.
6
.
1' i
n
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2009-04-05
Junio C Ha
m
ano
Merge branc
h
'
m
a
i
nt
-
1
.
6
.
0' into m
a
in
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus H
e
idelbe
r
g
d
o
c/git-p
a
ck-re
f
s
:
f
i
x t
w
o grammar i
s
sues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
J
eff King
tests: remove exit after test_d
o
ne c
a
l
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
commit: abort commi
t
i
f
interacti
v
e add
failed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Ch
r
is
t
ian Couder
bisect:
i
mpr
o
ve error message
when br
a
n
ch
che
c
kou
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Dan
M
cGee
git-repa
c
k
:
use
n
on-dashed upda
t
e-server-in
f
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Ja
y
Soffian
se
n
d-ema
i
l: fix nasty bug in ask() funct
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Update draft releas
e
note
s
to 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C
H
amano
Sync with 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
J
uni
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
Hamano
Merge
branch 'jc/maint
-
1
.
6
.
0-b
l
a
m
e
-
s' into
maint
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C
Hamano
Merge
b
ranch
'
js/maint-di
f
f-tem
p
-s
m
udge
'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hama
n
o
Merge
b
ranch 'js/m
a
i
n
t
-1
.
6
.
0-exec-path-env
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Hamano
Me
r
ge b
r
anc
h
'bc/mai
n
t-1
.
6
.
1-branch-de
l
ete
d
-wa
s
' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch
'
tr/main
t
-
1
.
6
.
1
-
doc-fo
r
mat-patch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge br
a
n
ch 'dm/
m
a
int-do
c
co' into maint
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send-em
a
il: ensure
q
u
oted ad
d
r
e
sses
are
r
fc2047 encoded
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
J
ay Sof
f
ian
send-email: correct two te
s
t
s
whi
c
h
were goi
n
g in
t
eractive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ham
a
no
Mer
g
e branch 'ef/
f
ast-e
x
por
t
'
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
M
e
rge b
r
anch '
m
h/format
-
patch-add
-
h
eader'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
H
amano
Mer
g
e
b
ranch 'tr/mai
n
t-1
.
6
.
1-doc-format-p
a
tch
-
-r
o
ot'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge branch
'
maint-
1
.
6
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Hamano
Me
r
ge branch 'm
a
int
-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
er
g
e
br
a
nch 'cj/doc-
f
ormat'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
H
amano
M
e
rge branch 'jc
/
main
t
-1
.
6
.
0-keep-pack'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hamano
Merge branch
'
kb
/
t
ra
c
k
i
ng-count-no-merges'
commit
|
commitdiff
|
tree
2009-04-02
Wesley J
.
Landaker
D
o
cumentation: git-svn: fix trunk/
f
etch svn-remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
B
j
örn Steinbrink
Ma
i
lmap: Allow
e
mp
t
y email addresses t
o
be
mapped
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Michael J
Grube
r
Make
local
b
r
a
n
c
h
e
s b
e
h
ave like remote branches
when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Heiko
Voigt
Clean
u
p
warnin
g
about known
issues in cvs
i
m
p
ort documen
t
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Holger
W
eiß
Doc
u
men
t
ation: R
e
move an odd
"instead"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay Sof
f
ia
n
send-emai
l
: ask_default should apply to all e
m
ails
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay
S
offian
sen
d
-
e
mail:
don't attem
p
t t
o
promp
t
if tty is closed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
J
eff Kin
g
t
1301
:
loo
s
en test
f
or
forced
modes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Je
f
f
King
fix portability problem with
I
S_
R
UN_
C
OMMAND_ERR
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Stephen
Boyd
format_sanitized_s
u
bject:
D
o
n't t
r
im past
i
nitial l
e
ngth
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Chris Johnsen
Documentation: use "
s
pur
i
o
us
.
sp" XSLT if DOCBOOK_SUPPRESS_S
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Joha
n
nes Sc
h
i
ndel
i
n
mailmap: r
e
surrect l
o
wer-casin
g
of email addresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Junio C
Hama
n
o
Merge git://
g
it
.
bo
g
omi
p
s
.
org/gi
t
-sv
n
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami Rudi
built
i
n-cl
o
ne
.
c: no need to s
t
rdup for setenv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
A
li Gholami Rudi
builtin-clone
.
c: make junk_p
i
d
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ham
a
no
Update draf
t
release
n
otes to 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C Hamano
M
erge branch
'
maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
M
e
rge branch 'maint-1
.
6
.
0' into m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Documentation: pus
h
.
default appl
i
es to all remotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Santi Bé
j
ar
Do
c
u
m
enta
t
ion
:
enhance
br
a
nch
.
<name>
.
{
r
e
mote,merge}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (
a
ka
.
.
.
Fix ba
s
h completion in path wi
t
h sp
a
ces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
bas
h
completion: only show 'log --merge'
i
f merging
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telmi
c
h- Sc
h
ot
.
.
.
git-tag(1):
add hint about
commit me
s
s
a
ges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
A
lla
n
Caffee
Docume
n
tation: update graph api ex
a
mple
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
J
u
n
io C Hamano
Merg
e
b
r
anch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ham
a
no
M
er
g
e
bran
c
h
'maint-1
.
6
.
1' int
o
m
aint
commit
|
commitdiff
|
tree
2009-03-30
J
u
nio C
Hama
n
o
M
e
rge branch 'maint-1
.
6
.
0'
i
nto maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffia
n
send-email
:
a
dd tests
for refactored prompting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffian
s
e
nd-email: 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
vn: fix ls-t
r
e
e usa
g
e
with dash-prefixed paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
J
ohannes Schindelin
import-zips: fix thinko
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
b
u
iltin-fast-export
.
c:
handle nest
e
d tag
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
builtin-fast-export
.
c: fix cr
a
sh on tagged t
r
ees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
buil
t
in-fast
-
export
.
c
:
t
u
rn error into w
a
rn
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Er
i
k Faye-Lund
t
e
st-suite: adding a
t
est
for fast-e
x
p
o
rt wit
h
ta
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
io C
H
amano
set_
s
hared
_
perm():
s
o
metimes
w
e
k
now
wha
t
the final
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C
Hamano
move_temp_to
_
file()
:
do no
t
forget 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
Mer
g
e branch
'
m
a
int
'
commit
|
commitdiff
|
tree
2009-03-28
Junio
C
Hamano
U
p
date dra
f
t r
e
lease no
t
es to 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge
bran
c
h 'jc/
m
a
i
nt-1
.
6
.
0-diff-b
o
rrow-
c
arefull
y
'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ha
m
ano
Merge branch 'j
s
/
r
emote-
i
mprovements'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hama
n
o
Merge
branch 'jk/clone-
p
ost-check
o
u
t
'
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Hamano
Merge branch 'm
a
int
-
1
.
6
.
1'
i
n
to maint
commit
|
commitdiff
|
tree
next