repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ew/http-backend-batch-headers'
2016-07-28
David A
g
uilar
dif
f
tool: us
e
Git:
:
* functions instead
o
f passing around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
Ag
u
i
l
ar
difftool: avoid $
G
IT_D
I
R and $GIT_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguila
r
subtree: a
d
just function definitions
to match Co
d
i
ngGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguil
a
r
subtree: adjust style to m
a
tch CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Dav
i
d Ag
u
ilar
subtree: fix "gi
t
subtr
e
e split --rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Ag
u
i
lar
t7900-subtree
.
sh:
fix quoting and broken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
D
a
v
id Aguilar
diff
t
ool: handle unm
e
rge
d
files in
d
ir-diff mod
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguil
a
r
difftool: initialize variables f
o
r readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David
A
gui
l
ar
merg
e
t
o
ol:
honor tem
p
file configuration when resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
a
vid Agui
l
ar
mergeto
o
l:
s
u
pport delete/
d
elete
conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
Davi
d
Ag
u
ilar
difftool: ignore
s
ymbolic l
i
n
k
s
in use_wt
_
file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
Da
v
id
A
gu
i
lar
contrib
/
subtr
e
e: ig
n
o
r
e log
.
d
a
te conf
i
gura
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
a
v
i
d A
g
uila
r
m
e
rgetool
s
: add winmerge as
a builti
n
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David
Aguilar
mergetool-
-
l
i
b: set IFS for difftool a
n
d
mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
guilar
mergetool
s
:
st
o
p
s
etting $status
i
n merge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
Aguilar
mergetool: simplif
y
conditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
difftool--he
l
per
:
add
e
xplicit exi
t
stat
e
ment
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
merg
e
t
ool--lib: remove use o
f
$
status
g
l
o
b
al
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
D
a
vid Aguila
r
difftool: h
o
n
o
r --trust-
e
xit-c
o
de for b
u
iltin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David
A
guilar
difftool: add support for
--trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d
A
guilar
t
7
610-mergetool: add test cases fo
r
m
ergetool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool:
add a
n
option f
o
r
w
r
iting to
a
tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
mergetool: use more conservative
temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
test
-
lib-functions
:
adjust style
to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
t7610-mergeto
o
l: use test_config t
o
i
s
ola
t
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
me
r
g
e
t
o
ols/
m
eld: make us
a
g
e
of
`--
o
utput` c
o
nfigurab
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
g
i
t-sh-se
t
up: move GI
T
_DIR initial
i
za
t
ion into a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
mergetool:
use mor
e
conservative temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Ag
u
ilar
test-lib-functions: adjust
s
tyle
t
o
m
atc
h
CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid
Aguilar
t7610-
m
erget
o
o
l
:
prefe
r
test_confi
g
o
ver git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
t7610-mergetoo
l
:
a
dd missing
&
& and remove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
t7610-mergetool: use tabs
instead of a mi
x
of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David
Aguilar
c
om
p
letion: add --
s
ho
w
-s
i
gna
t
u
re for log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
avid
A
g
u
ilar
stash: pr
e
fer --
q
uiet over sh
e
ll redirection
of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs: make
rev-parse
-
-quiet actuall
y
quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
D
a
vid A
g
uilar
t1503: use te
s
t_must_be_e
m
pty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Documentation
:
a note about stdout for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguila
r
cleanups: ensure
t
hat git-compat-ut
i
l
.
h is inc
l
ude
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
D
avid Aguilar
stylefix
:
asterisks s
t
i
ck to the
variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
a
vi
d
A
g
uilar
gitk:
C
atch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Use m
k
temp -d to
a
v
oid
predictable temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Ag
u
ilar
gitk:
H
o
n
o
r TMPDIR wh
e
n viewing external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David
A
guil
a
r
d
ifftool: suppor
t
rep
o
sitorie
s
with
.
git-f
i
l
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
A
guila
r
p
u
ll
:
a
dd --ff-only to the
h
elp
text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d Ag
u
i
l
ar
pull:
ad
d
pul
l
.
f
f
confi
g
ur
a
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vid Aguilar
imap-
s
end: eliminate H
M
A
C
deprecati
o
n
warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h:
e
liminate SH
A
-1 depreca
t
i
o
n warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Aguilar
Makefile: add
su
p
port for Appl
e
CommonCrypto fac
i
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Da
v
id Aguilar
M
akefile: fix defau
l
t regex setti
n
g
s
on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David A
g
uilar
mergetool
s
/
k
diff3: do not use --auto when diff
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
avid Aguila
r
hel
p
.
c: add a
co
m
patib
i
lit
y
c
o
mme
n
t to
cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid
A
guilar
c
o
ntrib/mw-to-git/t
/
inst
a
ll-wi
k
i
.
sh: use
a
lowe
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
g
u
ila
r
contr
i
b/exampl
e
s/git-remote
.
pe
r
l
: use a
lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
test
s
: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ila
r
git-svn
:
use a lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
guilar
Documentatio
n
/user-manual
.
txt:
u
s
e
a low
e
rcase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
templates/hooks--update
.
sample: use
a
lo
w
e
r
c
a
se "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agui
l
ar
cont
r
ib/
h
o
o
ks/se
t
g
i
tper
m
s
.
perl: use a lowerc
a
s
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contrib/examples: use a lowercase "usage
:
" s
t
ri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/fast-i
m
po
r
t/import-zips
.
py:
use spaces
instea
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d
A
g
uilar
cont
r
ib/fast-i
m
port/import-z
i
ps
.
p
y
: fix bro
k
e
n
error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
contrib/fa
s
t-import: u
s
e a lowercase "usa
g
e
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d
A
guilar
contrib/cred
e
ntial
:
use a lowerc
a
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Agu
i
lar
git-cvsimpor
t
:
u
se a
l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
g
it-cvsimp
o
rt: use
a
lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-cvsexp
o
r
t
com
m
it: use a lowercase "usa
g
e
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
g
i
t-archimpo
r
t: use a lowercase "usage:"
s
t
rin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ila
r
git-m
e
rge-one-file: use a low
e
rcase "
u
sage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
i
l
ar
git-relink: u
s
e a lowerc
a
se
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
ilar
git-s
v
n: use a l
o
wercase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Ag
u
ilar
git-sh-s
e
t
up: use
a
lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid
Aguilar
t7
8
00: "def
a
ults" is no
l
onger a bui
l
tin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Davi
d
Aguil
a
r
t78
0
0:
m
ode
r
ni
z
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800
:
update
c
o
p
y
r
ight not
i
ce
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
avid
Aguila
r
difftool: s
i
l
ence uni
n
it
i
ali
z
ed
v
a
r
iable warnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id
A
guilar
p
4
m
er
g
e: fix pr
i
ntf us
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agu
i
la
r
difft
o
ol--helpe
r
: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Ag
u
ilar
doc
:
genera
t
e
a list of valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Agu
i
la
r
m
er
g
etool
-
-lib: add functions for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merg
e
tool--lib: improve the help t
e
xt
i
n guess_me
r
g
e_
t
ool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
merge
t
ool-
-
li
b
: simp
l
ify command expressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id
A
g
uilar
mergetools:
simplify how we handl
e
"vim"
a
nd "
d
efaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
me
r
g
etool--lib: improve s
h
ow_tool_he
l
p() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
lar
merge
t
o
ols/vim: remove redu
n
d
a
nt diff
comman
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Aguilar
m
e
rgetool
s
/p4merge: Honor $TMPDIR for
t
he /dev/
n
ull
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David
A
g
u
ilar
m
erg
e
tools/p
4
m
e
rge: H
a
n
d
le
"
/d
e
v/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguila
r
me
r
getool--lib: Allow custom commands to ove
r
ride
bui
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk: Rename 'tagcontents' to 'cached_tagcontent
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: T
e
a
c
h "Reread references" to r
e
l
oad t
a
gs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David
A
guilar
mergetool,di
f
ftool: Docum
e
nt --tool
-
help cons
i
stently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
diff
t
ool: Disable --sy
m
links
o
n cygw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Ag
u
ilar
difftool:
H
a
ndl
e
compare()
r
eturnin
g
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ilar
difftool: Wr
a
p lon
g
lines for r
e
adability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftoo
l
: Chec
k
all return
codes
from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
ui
l
a
r
di
f
f
t
o
o
l: H
a
ndl
e
finding m
e
rget
o
ols/ i
n
a pa
t
h
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use symlinks
w
hen diff
i
ng against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Agu
i
l
ar
difftool: Call
the temp direc
t
ory
"
g
it-
d
ifftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
difftool: Mo
v
e option values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Eliminate global vari
a
b
l
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
di
f
ftool: S
i
mpli
f
y pri
n
t_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next