repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.7.1.4
2010-07-19
D
avid Aguil
a
r
Documentat
i
o
n: Explain git-mergetool's u
s
e
o
f tem
p
orary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Make
f
ile: Re
m
ove us
a
ge
o
f
dep
r
eca
t
ed Py
t
hon "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Ag
u
il
a
r
diff
t
ool: Fix '--gui' when
d
iff
.
gui
t
ool is unconfigur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid A
g
uilar
t7800-difftool
.
sh
:
Test
m
ergeto
o
l
.
prompt fallb
a
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguila
r
difftoo
l
: Update copy
r
ight notices to list e
a
ch
y
ear
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Agu
i
lar
difft
o
o
l: Use ev
a
l to expa
n
d '--extcmd' expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
difftool: Add
'
-x' and as an alias for
'
--e
x
tcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7
8
00-difft
o
ol
.
sh:
S
i
m
plify th
e
--
e
xtc
m
d
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
g
it
-
diff
.
txt: Link to git-d
i
f
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
diffto
o
l
:
A
llow specif
y
ing
u
nconfigured co
m
mands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Ag
u
ilar
difftoo
l
--helper
:
R
emove use
o
f t
h
e GIT_
M
ERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
difftool--helper
:
Update co
p
y
r
ight and
r
emove
d
i
stracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: Add '--g
u
i' for sele
c
ting a GUI too
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
ar
t7800-difftool: Set a bog
u
s tool
f
o
r use
b
y te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
i
d
A
guil
a
r
help: Do not unnecessarily l
o
ok f
o
r a re
p
osit
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguil
a
r
submodule
.
c
:
Sque
l
ch
a
"u
s
e before
assignment" war
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
diff: ge
n
erate
p
retty filenames in prep_t
e
mp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
co
m
pa
t
: add a
b
a
sename(
)
compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mkstemps(
)
comp
a
tibility
f
uncti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-replace to
.
g
itignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
a
v
id Aguilar
mergetool
-
-lib: a
d
d support for arax
i
s
m
erge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id Ag
u
i
lar
merg
e
tool--lib: s
p
e
cialize
d
iff
options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
A
g
uilar
merg
e
tool--lib: simplify
A
P
I
usag
e
by removing
more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/
m
e
r
g
etool: refact
o
r comm
a
nds t
o
use git-merge
t
ool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
mergetool: use
$
(
.
.
.
) instead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
lar
bash comple
t
i
o
n:
add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
difftool: a
d
d
s
upport for a difft
o
ol
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add various git-difft
o
ol tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
dif
f
t
oo
l
: move '
g
it-difftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d
A
g
uilar
diff
t
ool: add a -y sh
o
r
t
c
u
t for
--no-pr
o
mpt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
A
guil
a
r
difft
o
ol
:
use perl
b
uil
t
-in
s
when testing for msy
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
d
ifftool: re
m
ove the backup file featu
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
i
f
ft
o
ol: rem
o
ve merg
e
options fo
r
op
e
ndiff, tk
d
iff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d Agu
i
l
a
r
everyday
:
use th
e
dashless for
m
of
g
it-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
c
o
ntri
b
/difftoo
l
: u
s
e a sep
a
r
ate config names
p
a
ce for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David A
g
uil
a
r
contr
i
b
/
difftool: Don't repea
t
merg
e
tool
candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Aguilar
di
f
ftool:
p
u
t the c
u
rs
o
r on
t
he edit
a
ble
f
ile for
Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
difftool:
fix documentation pr
o
blems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid Agui
l
ar
contrib: ad
d
'git difftool' for laun
c
hin
g
common
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Agui
l
a
r
g
it-mergetool: properl
y
handle "git mergetool --
f
ilename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Da
v
id Agui
l
ar
test
s
: add a testcase for "
g
it
s
u
bmodule s
y
nc"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
avid Aguil
a
r
g
it
-
submodule:
add "sync"
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d
Agu
i
lar
git-submo
d
ule: replace duplic
a
ted code with a m
o
dule_li
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
a
v
i
d Ag
u
ilar
[
P
ATCH
]
gitk: Don't s
h
o
w local changes wh
e
n we t
h
er
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree