repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jl/test-lint-scripts'
2014-07-01
C
harles Bailey
f
i
lte
r
-branch: e
l
iminate duplicate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charl
e
s
B
ailey
compat/
b
swa
p
.
h
: dete
c
t en
d
ianness on more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charle
s
Baile
y
tests: don't
rely on stre
r
ror
t
ext w
h
en testing r
m
dir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charle
s
Bailey
di
r
.
c: make git_fnm
a
t
c
h()
n
ot i
n
line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
h
arles
Bailey
mergetool: Remove
explic
i
t references to /
d
ev/
t
ty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Ch
a
rles Bailey
s
t
ash
t
e
s
ts: stash can lose
d
ata in
a f
i
l
e
remov
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
stash
:
Don't
o
ver
w
rite files
t
hat hav
e
gone fro
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
arles Bailey
Document
a
tion: Describe other situation
s
whe
r
e -z aff
e
cts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
r
les Bailey
Change xdl_m
e
rg
e
to generate output even for nul
l
m
erge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: merg
e
-
f
i
l
e fa
i
l
s
to o
u
tp
u
t
a
nything for a
d
egenera
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
m
e
rgetool: fix running mergetool in sub
-
d
irec
t
or
i
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
ar
l
es
B
ailey
mergetool: Add a test
for
ru
n
ning mergetool in a s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charl
e
s Bai
l
ey
mergetool: resp
e
c
t
au
t
ocrl
f
by using ch
e
ckout
-
inde
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bail
e
y
m
e
r
g
etool: Don't keep temporary me
r
g
e
files
unles
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Baile
y
mergetool: Add prompt to continu
e
after failing t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s Bailey
Add -y/-
-
no-promp
t
option to m
e
rg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Bailey
Fix
s
ome tab/sp
a
c
e inconsistenci
e
s in git-m
e
r
ge
t
ool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Char
l
es Bailey
g
i
t-archive:
w
ork in bar
e
r
e
pos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git archive re
s
pect c
o
re
.
autocrlf wh
e
n
c
reating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add n
e
w test to
d
emon
s
trate
git archive core
.
a
u
tocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Bailey
merge-tool d
o
c
u
mentatio
n
: d
e
s
cribe custom
co
m
mand usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bai
l
ey
git
-
m
e
r
getool documentaiton: show toolnames in
typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Ba
i
ley
A
dd a very basic
test script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
T
each
gi
t
mergetool t
o
use
cus
t
o
m
commands
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bai
l
ey
Changed
an in
t
e
r
n
al variable of mer
g
etool to su
p
por
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
T
i
dy up gi
t
mergetool's backup
f
ile behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
Bailey
g
i
tk: Fix
t
he Make
f
ile to cope
w
ith
sys
t
ems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Cha
r
les Bailey
Remove o
l
d generated files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git
-
i
nstaweb b
r
e
akage on MacOS X du
e
to the
limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arl
e
s Ba
i
ley
Fix cl
o
ne not
t
o
ignor
e
dept
h
whe
n
perform
i
ng a
l
oc
a
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree