repo.or.cz
/
alt-git.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-rc1
2012-09-25
David Agu
i
l
ar
merge
t
ool-
-
lib
:
Allow custom commands to
override buil
t
-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agu
i
l
ar
gitk: Rename 'tagcontent
s
' to 'cac
h
ed
_
t
a
gconte
n
t'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach "Reread refere
n
ces" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
avi
d
Aguila
r
merget
o
ol,difftool: Docu
m
ent --tool-help c
o
nsistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid
A
g
uilar
difftool: Disabl
e
-
-
symlinks on c
y
g
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
iffto
o
l: Ha
n
dle com
p
are() retur
n
ing -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguil
a
r
di
f
ftool:
Wrap long lines for
r
e
a
d
a
b
ility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
di
f
ftool: Check all
r
et
u
rn codes
from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
uil
a
r
dif
f
t
ool:
Handle
finding m
e
rgetools/ in a
p
ath with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid
Aguilar
di
f
ftoo
l
: Use syml
i
nks
when diffing agains
t
the wor
k
tree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
g
uilar
d
i
f
f
tool: C
a
ll the temp directory "git
-
difftool
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
u
i
lar
diff
t
oo
l
: Mo
v
e op
t
i
o
n values in
t
o a ha
s
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
f
f
tool: Eliminat
e
globa
l
v
a
riables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
d
i
fftool:
Simplif
y
print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
A
guilar
t78
0
0: Test di
f
ftool passing
a
rgu
m
ents to di
f
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid Aguilar
mergetool: Provide an emp
t
y fi
l
e whe
n
needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
avid A
g
uilar
Makefile
:
Imp
r
ove compiler he
a
der depend
e
ncy
check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools/m
e
ld: Use '--outp
u
t' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Agui
l
ar
mergetool--lib
:
Refactor tools into separate
fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Agui
l
ar
mergetool--lib: Make style consist
e
n
t
w
i
th
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
d
iffto
o
l--helper:
Make style consistent wi
t
h git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Agui
l
ar
t/t750
3
-
p
re-commit-hook
.
sh: Add GIT
_
PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
g
i
t-mergetool
-
-lib: Make vim
d
iff retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove
handling for G
I
T
_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
setup: Provide G
I
T_
P
REFIX to b
u
ilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
id Aguilar
subm
o
dule sy
n
c
: Update
"submodule
.
<
name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
a
v
id Agui
l
ar
merg
e
tool
:
Skip autoreso
l
ved
paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguil
a
r
Documentation: Explain git-merge
t
ool's
u
se of tempor
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d Aguilar
Makefile: Rem
o
ve
u
sa
g
e
of deprecate
d
Pyt
h
o
n
"has_
k
ey
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
avid
A
guilar
dif
f
tool: Fix
'--gui'
w
h
e
n
diff
.
guitoo
l
is unconfig
u
r
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
avid Aguilar
t7800-difftoo
l
.
s
h:
T
e
s
t me
r
g
e
too
l
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Ag
u
ilar
difftoo
l
: Update copyright not
i
ces to l
i
st each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Use eva
l
to exp
a
n
d '--
e
xtcmd' expr
e
s
sions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool
:
Add '-x' and as an alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
g
uilar
t7800-d
i
fftool
.
sh: Simplify the --extcmd te
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
git-d
i
ff
.
txt: Lin
k
to g
i
t-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
gu
i
lar
d
i
f
f
tool: All
o
w
specifying u
n
c
onfigured c
o
mmands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguila
r
diffto
o
l--hel
p
er
:
R
emove
use
of
the GIT_MERGE_
T
OOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diffto
o
l--h
e
lpe
r
:
Update copyr
i
g
ht and remove
d
istracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
git-dif
f
t
ool: Add '--gui' fo
r
selecti
n
g
a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Aguilar
t
7800-difftool:
Set a
bogus tool for use by
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
avid
A
g
uilar
help: Do
not
u
nnecess
a
ril
y
look for a
r
epository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Aguilar
submodule
.
c
:
Squelch a "use before
ass
i
gnment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguil
a
r
diff: gener
a
te
p
rett
y
filena
m
es in prep_temp
_
blo
b
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
i
l
ar
c
ompat: add a basename() comp
a
t
i
bility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
compat: add
a
mkst
e
mps() compatibility
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
Add git-replace
t
o
.
gitigno
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David
Aguilar
mergetoo
l
-
-lib: ad
d
supp
o
rt for
a
raxis m
e
rg
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
uilar
me
r
getool--lib: specialize diff o
p
tions for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib: si
m
pl
i
fy API u
s
age by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
a
r
difftool/mer
g
eto
o
l: refactor
commands to use git-
m
erg
e
to
o
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
mergetool: use $(
.
.
.
) instead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
ba
s
h c
o
mple
t
ion: add g
i
t-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agui
l
ar
difftool: add s
u
p
p
ort fo
r
a difftool
.
p
r
ompt c
o
nf
i
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
difftoo
l
: add various git-d
i
fft
o
ol
t
e
s
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l: move 'git-difftool'
o
ut of co
n
trib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
:
add a -y
shortcut for
-
-no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
diffto
o
l: use perl built
-
ins when testing
fo
r
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
il
a
r
diff
t
ool: remove the backup f
i
le fea
t
ure
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
d
iff
t
ool: remove
m
erge opti
o
ns f
o
r opendi
f
f, tkdi
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyd
a
y: use the
d
ashless form of gi
t
-ini
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d
A
gui
l
ar
cont
r
i
b/dif
f
tool: use a separate config namespace f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
a
vid Aguilar
contrib/d
i
fftool: Do
n
'
t
repeat merge tool
c
and
i
dates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
ifftool:
p
ut the cursor on the
edi
t
able file
for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
diff
t
ool: fix documentation prob
l
ems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
A
g
uilar
cont
r
i
b:
a
dd
'
git di
f
ftool' for
l
au
n
ching common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git
-
m
e
r
get
o
ol: properly
handle
"git merget
o
ol
-
-
filena
m
e"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Agu
i
l
ar
tests:
a
dd a testcase fo
r
"git sub
m
o
d
ule
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submodule:
add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid Agu
i
la
r
git-s
u
bmodule: replace dupli
c
ated code
wi
t
h a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David A
g
uil
a
r
[
PAT
C
H] gitk: D
o
n'
t
show lo
c
al
changes when we the
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree