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-rebase--interactive.sh: use printf instead of echo to print commit message
2010-07-19
Da
v
id Ag
u
i
l
ar
D
o
c
u
m
e
nt
a
tion: Explain git-
m
erget
o
ol's use of temporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
avi
d
Aguilar
M
a
kefile:
Re
m
ove
u
sage of d
e
precated Pyt
h
o
n "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David
A
guilar
di
f
fto
o
l:
Fix '
-
-gui
'
when di
f
f
.
guitool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Ag
u
ilar
t78
0
0-difftool
.
sh:
T
e
s
t me
r
g
e
tool
.
prompt fa
l
lback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
i
ff
t
o
o
l
:
Update
c
o
p
yrig
h
t notices to lis
t
each
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
d
i
fftoo
l
:
Use ev
a
l to expand '--extcmd' e
x
pr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
i
d
Aguil
a
r
difftool: Add '-x'
a
nd as an alias for '--
e
xtcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguila
r
t7
8
00-difftool
.
sh: Si
m
plify the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt:
Link
t
o git-difftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid
A
g
uilar
difftool:
A
ll
o
w
specifying unco
n
figured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difft
o
o
l--helper: Remove u
s
e of th
e
GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
d
i
fftool--helper: Update copyright and remove distrac
t
ing
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-di
f
ftool: Add '--g
u
i' fo
r
s
e
lecting
a
GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-difft
o
ol:
Set a bog
u
s tool for
u
se by t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
avid Aguilar
help: Do n
o
t u
n
necessarily lo
o
k for a repo
s
it
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Aguilar
subm
o
dule
.
c:
S
q
uelch a "use bef
o
re assign
m
ent"
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff:
g
ener
a
t
e
pre
t
t
y
filename
s
in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Ag
u
ilar
compat: add a basena
m
e() com
p
atibility fu
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat
:
add a mkstemps()
compati
b
ility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
l
a
r
Ad
d
gi
t
-
repla
c
e to
.
git
i
g
n
ore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguilar
mergetool-
-
l
i
b:
a
dd support for ar
a
xis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
merg
e
tool--lib: specializ
e
di
f
f opt
i
o
ns for e
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool
-
-lib:
simplif
y
API
usage
b
y re
m
oving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
d
ifftool/merge
t
ool:
r
efactor c
o
mmands to use
g
it-merg
e
tool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
mergetool: use
$
(
.
.
.
) instead o
f
`backti
c
ks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
bash comp
l
e
tion: add g
i
t-
d
ifft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
dif
f
tool: add
s
upp
o
rt
for a difftool
.
prompt confi
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Aguil
a
r
d
ifftool: add various git-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
d
iff
t
ool: mo
v
e 'git-diff
t
ool'
o
ut of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
add a -y shortcu
t
f
o
r
-
-no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
uila
r
difftoo
l
: use perl buil
t
-ins when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uil
a
r
diffto
o
l:
remove the
b
ackup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove merge options for opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
avi
d
Aguilar
e
veryday: use the dashless form of
git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
co
n
trib/di
f
ftool: use a separate config names
p
a
ce for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
a
vid
A
g
uilar
contrib
/
difftool: Don
'
t repeat merge tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id
A
guila
r
difft
o
o
l
: put the cursor o
n
the e
d
ita
b
le file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difft
o
ol: fix documen
t
at
i
on problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: add 'g
i
t dif
f
t
o
o
l
' f
o
r
l
aunching comm
o
n merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David A
g
uilar
git-mer
g
e
t
o
o
l
: p
r
operly ha
n
dle "git mergetool -- filena
m
e"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
test
s
: add a testcase for "gi
t
sub
m
odul
e
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Aguilar
git-submodule: add
"sync
"
co
m
mand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule:
r
epl
a
ce duplica
t
ed
c
ode wit
h
a module_li
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid Aguil
a
r
[PATCH
]
gitk: Don't
sho
w
local c
h
a
n
ges w
h
en we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree