repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Prepare for 1.7.2.3
2010-08-18
D
avid
Aguila
r
s
u
bmodule sync: Update "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David A
g
ui
l
a
r
Document
a
tion:
Exp
l
ain git
-
me
r
getool's use of
t
emporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David
A
guilar
Makefile: Remove usage of depr
e
c
a
ted Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
Aguilar
diffto
o
l:
F
ix '--gu
i
'
when
d
iff
.
g
u
itool
i
s
u
nc
o
nfig
u
re
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Agu
i
l
ar
t7800
-
difftool
.
sh: Te
s
t merg
e
tool
.
prompt fallba
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
i
d
Agui
l
ar
difftool:
Update copyright not
i
ces to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
ifftool: Use eval to expand '--extcmd' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
difftool: Add '-x' and
a
s
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 test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt: Li
n
k to git-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
diff
t
ool
:
Allow spec
i
fy
i
ng unconfig
u
red commands wit
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difft
o
ol--help
e
r: Remove use of the GIT_ME
R
GE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id A
g
u
ilar
difftool--helper: Update copyright and remove
dist
r
acting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguilar
git-difftool
:
A
d
d
'
-
-gui' for selecting
a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
t
7
8
0
0-di
f
ftool
:
S
e
t
a bo
g
us tool
fo
r
use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do no
t
unnecessarily look for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Aguilar
submo
d
u
le
.
c
: Squelch a "use
b
e
fo
r
e
a
ssignment"
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: generate pre
t
ty filenames in pre
p
_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
c
o
mpat: add a basename() comp
a
tibilit
y
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Agui
l
ar
c
o
mpat: add a
m
ks
t
e
mps() com
p
atib
i
lity
f
u
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
A
dd git-r
e
place to
.
gi
t
ignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id Ag
u
ilar
merge
t
ool--lib: add support for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
me
r
getool
-
-lib: spec
i
aliz
e
diff o
p
tions
f
or eme
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Aguilar
mergetool--lib
:
sim
p
lify API usage b
y
r
e
moving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
diff
t
oo
l
/me
r
getoo
l
: refactor comm
a
nds
t
o use git
-
mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
merg
e
t
o
o
l
: use $(
.
.
.
)
ins
t
e
ad o
f
`backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Agui
l
ar
bash com
p
letion: add
git-diffto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
diffto
o
l: add support for a d
i
fftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
a
dd various git-
d
ifftool test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d Agui
l
ar
difftool: move 'git-d
i
f
f
tool'
out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: add a -y shortcut for -
-
no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool
:
use perl bui
l
t-ins
w
hen
testi
n
g for
ms
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
l
a
r
difft
o
ol:
r
em
o
ve th
e
bac
k
up fi
l
e feat
u
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: r
e
m
o
ve merge options
f
or opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David A
g
u
ila
r
everyday: use the dashless form of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
Agui
l
ar
contrib/difftool:
u
se
a
sep
a
rate co
n
fig namespace
f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David A
g
uilar
contrib/difftool: Don't
repeat merge too
l
candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
ifftool
:
put the cursor on the
editable file for Vi
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguilar
di
f
f
t
ool: fix documentatio
n
problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid
A
gui
l
ar
contrib: add 'git difftool' for la
u
nchi
n
g common merg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mer
g
e
t
ool: proper
l
y ha
n
d
l
e "git mergetool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David
A
guilar
tests: add a
t
est
c
ase
f
or "git s
u
bmodule
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guila
r
git-
s
ubmodule: add "
s
ync" com
m
an
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-s
u
bmodule: replace
dup
l
ic
a
t
e
d
c
od
e
with
a
module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguil
a
r
[
P
ATCH
]
gitk: Don
'
t
show local cha
n
ges when
we
there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree