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
do not overwrite files marked "assume unchanged"
2010-03-29
David Aguilar
Makefile: Remove usage of
deprecat
e
d Python
"
has_k
e
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: F
i
x '--gui'
w
hen
diff
.
guito
o
l
is
u
nconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
avid A
g
u
i
l
ar
t7800-d
i
ffto
o
l
.
s
h
: Test mer
g
etool
.
pro
m
pt f
a
ll
b
ack
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
avid Aguilar
difftool: Update copyr
i
ght
notices
t
o
l
is
t
each yea
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
fftoo
l
: Us
e
eval
to expand '--extcmd' expr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
d
i
f
ftool:
A
dd '-x' and as an alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
A
gui
l
ar
t
7
800-difftool
.
sh: Simp
l
ify the --ext
c
md test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
git-dif
f
.
txt: Link to git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
d
i
f
f
t
ool: Al
l
ow specifying un
c
onfi
g
ured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
d
i
ff
t
ool
-
-helpe
r
: Remove
us
e
of the GIT
_
MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
dif
f
t
o
ol--helper: Up
d
a
t
e copyrig
h
t and remove dist
r
acting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Aguilar
git-difft
o
ol: A
d
d '--gui' for selec
t
i
n
g a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
g
u
ilar
t
7
800-difftool
:
Set
a bogus tool for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Aguilar
help:
Do not u
n
ne
c
essar
i
ly lo
o
k
for a re
p
ository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
ilar
s
ubm
o
dule
.
c:
S
q
uelch a
"use
b
e
f
or
e
assi
g
nment" w
a
rnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
diff: generate pret
t
y f
i
le
n
ames in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a
basename() c
o
m
p
atibili
t
y function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat:
add a mkstem
p
s() compatibility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
Add git-replace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
m
erget
o
ol--lib: add support
f
or ar
a
xis merg
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
uilar
mergeto
o
l
-
-lib: specialize dif
f
option
s
for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vi
d
Ag
u
ilar
me
r
getool--lib: simplify A
P
I
us
a
ge
by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool/mergetool:
r
efacto
r
c
o
mmands to use
git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
merget
o
ol: use $(
.
.
.
) instead of
`backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
bash
c
ompletion: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
ilar
diff
t
ool: add suppo
r
t for a difftool
.
prompt c
o
nfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
add
various git-diffto
o
l tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agu
i
l
a
r
difftool:
move 'git-diff
t
ool'
o
u
t o
f
c
o
ntrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: add a -y shortc
u
t for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: use
perl built-ins wh
e
n tes
t
ing for
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool:
r
emove t
h
e backup
f
ile f
e
a
ture
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guila
r
difftool: remov
e
merge opti
o
ns for opendiff, tkd
i
ff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
avid Agu
i
lar
everyday: use
t
he d
a
shle
s
s form of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
id Aguilar
contrib/difftool: use a s
e
p
arate c
o
nfig namesp
a
ce for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
con
t
r
i
b/dif
f
t
ool:
D
o
n
't repeat me
r
ge to
o
l ca
n
didates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
A
g
u
ilar
difftool: put the
c
urs
o
r
o
n the e
d
i
t
abl
e
file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
A
g
uilar
d
ifftool: fix documentation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid Aguilar
contri
b
: add 'git difftool' for lau
n
ch
i
ng com
m
on merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
id Aguilar
git-m
e
r
getool: properly handle "gi
t
me
r
getool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Da
v
id Aguilar
tests: ad
d
a testcase for "git su
b
mo
d
ul
e
sync
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguila
r
git-submod
u
le: add
"sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
v
i
d Aguila
r
git-
s
ub
m
odule: rep
l
ace duplicated
code
w
i
th a modul
e
_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gitk: Don't show l
o
cal
changes
w
hen w
e
there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree