repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.8.0-rc2
2012-09-25
David Aguilar
me
r
getool--li
b
: Allow custom command
s
to
o
verride built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
gitk: Rena
m
e 'tagco
n
tents' to 'cached_
t
agcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
gitk: Teach
"
Reread references" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
me
r
getool,difftool: Document --tool-help
cons
i
stently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
difftool: Disa
b
le
--
s
ymlinks o
n
cygw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Handle com
p
a
re() returni
n
g -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftoo
l
:
Wrap long lin
e
s for re
a
dability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
di
f
ftool: Ch
e
c
k
all return codes fr
o
m compar
e
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
ilar
difftool: Handle
finding mer
g
e
tools/ in a path w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool
:
Use s
y
mlinks when diffi
n
g against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool: Call
t
he temp di
r
ec
t
or
y
"g
i
t-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid
A
guilar
difftool
:
Move o
p
t
ion val
u
es int
o
a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
dif
f
to
o
l: Eliminate g
l
o
b
a
l
variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: S
i
mplify print_too
l
_help
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
a
v
id Agui
l
ar
t7800:
T
est d
i
fftool passing argume
n
ts
to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Agu
i
lar
merget
o
ol
:
Pr
o
vide
an
e
m
p
t
y
f
ile when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Aguilar
Makefil
e
: Improve compiler
header de
p
e
ndency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
mergetools/meld: Use '--output' whe
n
a
vai
l
ab
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: Re
f
acto
r
tools into separ
a
t
e
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
ui
l
ar
mergeto
o
l-
-
l
ib
:
Make style
c
onsistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
difftool--
h
elper: Make styl
e
con
s
istent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
avid Aguilar
t
/
t7503-
p
re-commit-hook
.
sh: Add GIT_PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t
-
mergetoo
l
--lib: Make vimdi
f
f r
e
tain t
h
e curre
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id A
g
uilar
git: Remove h
a
ndli
n
g
for GIT
_
PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
setup: Provide GIT_
P
R
E
FIX
t
o
b
uilt
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync
:
Update
"submodule
.
<
name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
avid Ag
u
il
a
r
mergetool: Skip autor
e
sol
v
ed
path
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
A
g
uilar
Doc
u
mentati
o
n: Explain
git-mergeto
o
l's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefil
e
: Rem
o
ve usage of dep
r
ecated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d
A
guilar
d
i
f
ftool: Fix '--gui' when diff
.
guitool is
u
nc
o
nfi
g
u
red
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difftool
.
sh
:
Test m
e
rget
o
ol
.
prom
p
t fallb
a
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
if
f
tool: Update copyri
g
ht notices
to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
d
i
fftool
:
Use ev
a
l
to expand '--extcm
d
' express
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
difftool
:
Add
'
-
x' and as an al
i
a
s
f
or
'
--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Agu
i
lar
t7800-difftool
.
sh: Simp
l
if
y
the --extc
m
d
t
e
st
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
git-diff
.
t
x
t:
Lin
k
to git-difftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool
:
Al
l
o
w
s
p
e
c
if
y
i
ng unconfigur
e
d comman
d
s with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
difft
o
ol--helper: Rem
o
ve
u
se o
f
the GIT_
M
ER
G
E
_
TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Ag
u
ilar
dif
f
tool--helper: Up
d
ate
copyri
g
ht and remove distractin
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
git
-
difftool:
A
dd '--g
u
i
'
fo
r
s
e
lecting a GUI too
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
g
uilar
t7800-difftool: Set a bogus too
l
for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Agu
i
lar
help: Do not unneces
s
arily
look
f
or a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id Aguilar
submod
u
le
.
c
:
Squelch a "
u
s
e
be
f
ore assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: generate pret
t
y filename
s
in pre
p
_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
compat: add a basename() compatibilit
y
f
u
nct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mkstemps()
c
ompatibility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d Aguilar
A
dd gi
t
-
r
eplac
e
to
.
g
itignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Agu
i
l
a
r
me
r
getool-
-
lib: add
support
f
or
a
r
axis m
e
rge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d
A
gui
l
ar
mergetool--lib:
speci
a
l
i
ze d
i
ff opt
i
ons
for
e
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Aguilar
merg
e
tool-
-
l
ib: simplify API usage b
y
removing mo
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l/m
e
rgetoo
l
:
r
efactor commands to use git-mergeto
o
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
mergetool: use $(
.
.
.
)
instea
d
o
f
`backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d
A
g
uilar
bash co
m
p
l
etion:
a
dd gi
t
-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
Aguilar
difftool: ad
d
suppor
t
for a difftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
d
ifft
o
o
l: ad
d
various git-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
dif
f
tool: move 'git-diffto
o
l' out of
contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
dif
f
tool: add a -y shortcut for --no
-
promp
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
d
i
fftool: use per
l
b
u
ilt-ins when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: re
m
ove the ba
c
kup file fe
a
ture
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d A
g
ui
l
ar
difftoo
l
: remove merge opti
o
ns
f
or opendiff
,
tkd
i
ff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid Aguilar
eve
r
yday: use the dashless f
o
rm of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Aguilar
contrib
/
diff
t
ool: use a se
p
arate con
f
ig nam
e
sp
a
ce for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David A
g
u
i
l
ar
con
t
rib/di
f
fto
o
l: D
o
n't repeat merge tool candi
d
ate
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid
Ag
u
ilar
difftool: put the cursor on the
e
d
i
table
f
i
le
f
or Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
tool: fix do
c
umentation
p
roblems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
A
guilar
contrib
:
add 'git di
f
ftool'
f
or launching common
m
erg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David A
g
uilar
git-mergetool: properly
handle "gi
t
merg
e
t
ool -- f
i
lename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguil
a
r
t
e
sts: add a testcase for "
g
it submodu
l
e
s
y
nc"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
v
id
Aguila
r
git-s
u
bmodule: add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Agui
l
ar
git-submodu
l
e: replace d
u
plicate
d
c
o
d
e w
i
th a modul
e
_lis
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid Aguilar
[PATC
H
] gitk: Don't sho
w
local
c
hanges w
h
en we ther
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree