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
difftool--helper: fix printf usage
2013-02-10
David Aguilar
difftool--hel
p
er:
fix printf
u
sa
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
A
guilar
gitk: Rename 'tagconten
t
s' to 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
git
k
: Teach "Reread references" to rel
o
ad tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguila
r
t
7
800: Tes
t
difftool passing arg
u
ments t
o
d
i
ff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
avi
d
Aguilar
me
r
getool
:
Provide an empty
f
ile when need
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
avid Aguil
a
r
Makefil
e
: Impro
v
e com
p
iler header dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
merg
e
t
o
ols/meld: U
s
e '--output' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
gu
i
l
a
r
m
ergeto
o
l
-
-
l
ib:
R
efactor tools into separate f
i
les
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid
A
guilar
m
e
rgetool--lib:
M
ake style consisten
t
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool--helper: Make sty
l
e c
o
ns
i
stent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7
5
03
-
pre-co
m
mit-hook
.
sh: Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid
Aguilar
g
i
t-mergetool--lib: Make
vimdif
f
r
etai
n
the curre
n
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove
handling
for
GIT_PRE
F
IX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
u
i
lar
s
e
t
u
p:
P
rovid
e
GIT_PREFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
a
v
id Aguilar
submodule sync: Update "submodule
.
<n
a
me>
.
u
r
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
v
id
A
guilar
mergetool: Skip autoresolve
d
paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
D
o
cume
n
t
a
tion:
E
x
plain git-mergetool
'
s use of temporar
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
av
i
d A
g
uilar
Makefile: Remove
usage of de
p
recated Python
"
h
a
s_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
Aguilar
d
iffto
o
l:
Fix '-
-
gui' whe
n
diff
.
gui
t
ool is
unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Agu
i
lar
t7800-difft
o
ol
.
sh: Test merg
e
tool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
uila
r
difftool:
U
pdate copyri
g
ht
n
oti
c
es
t
o lis
t
each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
dif
f
tool
:
Use eval to exp
a
nd '--extcm
d
' exp
r
essions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
dif
f
t
o
ol:
A
dd '-x' and as
a
n ali
a
s for '--extc
m
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-di
f
ft
o
ol
.
sh: Simplify the --e
x
tcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
git-diff
.
txt: Li
n
k to
g
i
t
-d
i
fftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
d
iffto
o
l
: Allow
specify
i
ng unco
n
fi
g
ured
c
o
mm
a
nds with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
u
il
a
r
diffto
o
l
-
-helper: Rem
o
ve use of t
h
e GIT_
M
ERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--helper:
Update
c
opyright
a
nd remove dis
t
racting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-
d
i
f
f
t
ool: Add '--
g
ui' for select
i
ng a GUI too
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Aguila
r
t7800-d
i
f
f
tool: Set a bogus tool f
o
r
use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
A
guilar
help: D
o
not unnecessarily
l
ook for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
sub
m
o
dule
.
c: Squelch a "use be
f
ore as
s
ignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
diff: generate pretty
f
i
lename
s
i
n
p
rep_temp_blob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
compat: add a
b
asena
m
e
(
) com
p
atibility fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
compa
t
: a
d
d
a mkstemps
(
) compatibility fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
A
d
d
g
it-replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
av
i
d
Aguilar
m
e
rge
t
o
o
l--lib: add su
p
port for
ar
a
xis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Agui
l
ar
mergetool
-
-lib
:
special
i
ze
d
iff
o
pt
i
on
s
for em
e
r
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
avid A
g
uila
r
merget
o
o
l--lib: simplif
y
A
P
I
usage by
removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
dif
f
t
ool/mergetool: refa
c
to
r
commands
to u
s
e
g
i
t-m
e
rget
o
o
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
mer
g
etool
:
u
se $(
.
.
.
) inste
a
d of `back
t
icks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguila
r
bash completion:
a
dd
g
it-
d
iff
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool:
add support fo
r
a difftool
.
prom
p
t config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
di
f
fto
o
l:
a
d
d various
g
i
t-diff
t
o
ol test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
diff
t
ool
:
move 'g
i
t-difftool'
out of contr
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool: add a -y shortcut for
-
-no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
diff
t
ool: use p
e
r
l
built
-
ins wh
e
n testing
f
or
m
sys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: remove the backu
p
f
i
le featur
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
diff
t
ool: r
e
m
ove merge opt
i
ons for opend
i
ff, t
k
diff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
e
v
eryday: use the dashless for
m
of git-in
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid A
g
uilar
c
o
n
t
r
ib/difftool:
use a separ
a
t
e
c
onfig
n
a
mesp
a
ce for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
cont
r
i
b
/dif
f
tool: Don't
repeat merge
tool
c
andidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
A
guilar
d
i
fftool: put
t
he cursor on the ed
i
t
able f
i
le for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
too
l
: fix
documentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
c
o
n
trib: add 'gi
t
difftool
'
f
or lau
n
ching
c
o
mmon merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: proper
l
y
handle "git
m
ergetool
-- f
i
lenam
e
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David A
g
uilar
t
ests
:
ad
d
a testca
s
e for "git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Ag
u
ilar
git-submodule: add
"
sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Ag
u
i
l
ar
git
-
submo
d
ule:
r
epl
a
ce duplicated code with a m
o
dule
_
list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguila
r
[PATCH] gitk: Don't s
h
ow
l
oc
a
l c
h
anges when
we t
h
ere
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree