repo.or.cz
/
git
/
kirr.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
blame documentation: -M/-C notice copied lines as well as moved ones
2010-03-28
David Aguilar
di
f
f
t
ool: Fix
'
-
-
gui'
w
hen d
i
f
f
.
guitoo
l
is u
n
c
o
nfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguila
r
t78
0
0-difftool
.
sh:
T
e
s
t mer
g
etool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
A
guilar
difftool:
U
p
d
a
te copyrig
h
t notices to list each ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
diffto
o
l
:
U
se eval to exp
a
nd '--extcmd' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguil
a
r
diff
t
ool: A
d
d '-x' a
n
d as a
n
ali
a
s f
o
r
'
--extc
m
d'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
t
7
800-d
i
fftool
.
sh:
S
implify the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
gi
t
-d
i
ff
.
txt: Link to git-difftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
d
i
fftool:
A
llow specifyin
g
u
n
c
onfigured c
o
mmands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
difftool--helper: Remove
use of t
h
e GIT_ME
R
GE
_
TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
diff
t
ool--helpe
r
:
U
pda
t
e co
p
yright a
n
d remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
git-difftool: Add '-
-
gui'
fo
r
selec
t
ing a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguilar
t7800-d
i
f
ft
o
o
l
:
Set
a
b
ogus
t
o
o
l
for use by test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d
Aguilar
h
e
lp: Do not unneces
s
arily look for a r
e
pository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Agui
l
ar
submodule
.
c: Sq
u
elch
a "
u
se before assign
m
e
nt"
warnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
u
ilar
di
f
f
: generate pretty
fi
l
enames in pr
e
p_temp_
b
l
o
b()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a
b
asename() compa
t
ibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
compat: add a m
k
stemps()
c
ompatibili
t
y function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guila
r
Add
git-repl
a
ce t
o
.
gitig
n
ore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--li
b
: add supp
o
rt
f
or a
r
axis merg
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Ag
u
ilar
mergeto
o
l--l
i
b: specia
l
i
z
e d
i
ff options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib: simplify API usage
by removing mor
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool/mergetool:
r
efactor
commands to use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
i
l
ar
merget
o
o
l: use $(
.
.
.
)
inste
a
d o
f
`b
a
ckticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
a
s
h completion: add g
i
t-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguila
r
difftool: add support for
a
difftool
.
p
r
ompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: a
d
d various git-dif
f
tool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
iff
t
ool: move 'git-difftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
lar
difftool: add a -y shor
t
cu
t
for
--
n
o-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool: use per
l
built-ins when
te
s
tin
g
for m
s
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool:
r
emove the
b
ackup file fea
t
ure
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove merge
o
p
t
ions for ope
n
diff, t
k
diff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Aguila
r
eve
r
yday:
u
s
e the dashl
e
s
s
form of git-i
n
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contri
b
/difftool: use a separate config na
m
espace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
co
n
trib/
d
if
f
tool: Don'
t
re
p
eat me
r
g
e
tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguilar
diff
t
ool: put the cursor on
the
e
dita
b
l
e
file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
tool: fix docu
m
entation proble
m
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
A
gui
l
ar
c
ontrib: add
'
git di
f
ftool' f
o
r l
a
u
n
ching common
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Agui
l
ar
git-mergetool: p
r
operly handle "git mergetoo
l
-- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
avid Aguila
r
test
s
: add
a testcase for "git sub
m
odule sy
n
c"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Aguilar
gi
t
-submodule: ad
d
"sync" co
m
mand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Davi
d
Agu
i
lar
g
it-submodule: replace duplicated
c
ode wit
h
a module_
l
ist
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid Aguil
a
r
[PATCH] gitk: Don't show local chang
e
s
whe
n
w
e
there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree