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
shell: Rewrite documentation and improve error message
2010-07-19
David Aguilar
Docu
m
e
ntation: Ex
p
lain git-merget
o
o
l
's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguila
r
Make
f
i
l
e
:
Remove usage of de
p
re
c
ated Pyt
h
on "has_
k
e
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Agui
l
ar
dif
f
tool: Fix '
-
-g
u
i
' when diff
.
guitool is
unconfig
u
red
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d Agui
l
ar
t
780
0
-difftool
.
sh: Test merg
e
tool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
a
v
i
d
Aguilar
difft
o
ol: Upda
t
e copyright notices to
l
ist each ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
u
i
lar
diff
t
ool
:
Use eval
t
o
expand '--extcmd' express
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
d
i
fftool: Add '-x'
and as an ali
a
s
for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
t7800-difftool
.
sh: Simplify the --extcmd tes
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid
A
guilar
g
i
t-diff
.
t
xt: Link t
o
g
it-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
difftoo
l
:
A
l
low specifying uncon
f
igured commands w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
f
f
to
o
l
--hel
p
er: Remo
v
e
use
o
f
t
he GIT_MER
G
E_
T
OOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--helper
:
Update cop
y
right and
remov
e
d
i
stracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
A
g
uilar
git-diff
t
ool: A
d
d '
-
-gui' for select
i
ng
a G
U
I tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
lar
t
7
8
00
-
difftool: Set a bogus too
l
for use
b
y
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
Aguil
a
r
help: Do
n
o
t unnecessarily lo
o
k f
o
r a repositor
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Squelch
a
"
u
s
e befor
e
assignme
n
t
"
war
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Ag
u
ilar
di
f
f:
gene
r
ate pretty fil
e
names
i
n
p
rep_temp_
b
l
o
b
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
compat
:
a
d
d
a
basename() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mkstemps() co
m
p
a
tibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-repl
a
ce
t
o
.
gitig
n
o
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
Aguila
r
merg
e
tool
-
-lib
:
ad
d
support for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
Aguila
r
merget
o
o
l--lib: specialize diff
op
t
ions for
e
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Ag
u
i
l
a
r
mergetool
-
-l
i
b: simplif
y
API usag
e
b
y remov
i
ng more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d A
g
ui
l
ar
diffto
o
l
/
m
e
rgetool: ref
a
ctor commands to
u
se git-merge
t
ool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool: use $(
.
.
.
)
i
nstead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Ag
u
ilar
bash c
o
mple
t
ion: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: add suppor
t
for a d
i
fft
o
ol
.
pr
o
mpt con
f
i
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
ftool: add various git
-
diffto
o
l
t
est
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
d
i
f
ftool: move 'git-difftool
'
out
of con
t
rib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
dif
f
tool: a
d
d a -y shortcut
for --no-promp
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difft
o
o
l
: use p
e
rl built-i
n
s
w
h
en testing for
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
la
r
difftool: r
e
mov
e
the backup fi
l
e feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
difftool: remove merge op
t
io
n
s fo
r
o
pendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Agu
i
lar
everyday: use t
h
e dashless
f
o
rm of git-
i
n
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David
Aguil
a
r
c
o
n
t
rib/diff
t
o
ol: u
s
e a
separate
c
o
n
fig
n
am
e
spac
e
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
avid Aguilar
contrib/difftoo
l
: Don't
r
epeat merg
e
tool can
d
idates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguila
r
difftool: put th
e
cursor on
the ed
i
table file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id
Agu
i
l
a
r
d
i
fftool:
f
ix
documentation
p
roblems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
co
n
trib: add
'
g
i
t
d
i
f
ftool'
f
o
r launch
i
ng common m
e
r
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid A
g
uilar
g
it-mergetool: properly h
a
ndle
"git mergetool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add
a testcas
e
for "git sub
m
odule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
g
it-su
b
module: ad
d
"sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Aguilar
git-s
u
bmodule: replac
e
duplicat
e
d co
d
e with
a
m
o
d
ule_l
i
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
a
v
i
d
Aguilar
[PATC
H
] gitk:
D
o
n'
t
show local changes w
h
en we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree