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
Remove the line length limit for graft files
2013-10-28
Johan
H
erland
sha
1
_file
.
c:cre
a
t
e
_tmpfi
l
e(): F
i
x race when creatin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan
H
erland
git-s
v
n
:
Warn about changing defa
u
lt for --
p
r
e
fix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Joh
a
n Herlan
d
Documentation/git-s
v
n: Promo
t
e the use of --pre
f
ix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Johan Herland
sample
pre-commit hook: use --bo
o
l when retri
e
v
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n
H
e
rland
t3200: Add test demonst
r
ating
minor regressi
o
n in 41c21
f
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
Refer to bra
n
ch
.
<name
>
.
remote/merg
e
wh
e
n documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n Herland
t3200
:
Minor fix when pre
p
aring for tra
c
king failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
nd
t202
4
: Fix
&
&-chaining
and
a
coup
l
e of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herland
M
o
ve create_notes_com
m
it
(
)
from notes-merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
H
erland
M
ove c
o
p
y_not
e
_for_rew
r
ite + frie
n
ds from
builti
n
/no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an Herland
fin
i
s
h
_copy_notes_for
_
rew
r
ite(): Let caller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
glossary: Upd
a
te and rephrase the d
e
finition of
a
remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
a
n
d
b
r
anch
.
c: Vali
d
ate tracking branch
e
s with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t9114
.
2: Don't use --
t
rack option against
"
svn-rem
o
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t72
0
1
.
24: Ad
d
refspec
to
k
e
e
p
-
-track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t3200
.
39: tracking s
e
tup
s
h
oul
d
fail
i
f
there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: Use remote ref
s
pecs w
h
en DWIMmi
n
g trackin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an
H
erland
t2
0
2
4
: Show failure to
u
s
e refspec when DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
t
2
0
24: Add tests verifying curr
e
nt DWIM
b
ehavior
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan
H
erland
git symbolic-ref --delete
$
s
ymre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
F
ix fa
i
lu
r
e
to
dele
t
e
a
packed ref through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan H
e
rland
t140
0
-update-ref:
Add test ve
r
if
y
ing bug
w
i
th sy
m
re
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
h
an Herland
notes-
m
e
rge
:
Don't re
m
ove
.
git
/
N
O
TES_MERGE_WORKTRE
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herland
n
otes-
m
erge: use opendir/readdir inst
e
ad of usin
g
r
e
a
d_d
i
rec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
t3310
:
i
l
lustra
t
e
failure to "notes
merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fa
s
t-import: Fix
i
ncorrect fanout level when mo
d
i
f
ying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
t9
3
01:
A
dd 2nd testcase
e
x
posing
b
ugs in
fast-imp
o
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n
He
r
lan
d
t930
1
: F
i
x
te
s
tcase
c
overing up a bug in fas
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
r
l
and
t
5400:
Fix a co
u
ple of ty
p
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Ma
r
k dirstat e
r
ro
r
messages
f
or tran
s
latio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Improve error han
d
ling when parsing dirstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --dirstat=
l
ines m
o
de, doing
d
irstat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herland
Allow spe
c
if
y
in
g
--dirstat cut-off perc
e
ntage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Add config
v
ariable for speci
f
y
i
n
g
default -
-
dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Refactor
--
d
irsta
t
parsing; de
p
recate
--cum
u
la
t
ive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Make --dirstat=0 output directories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several testcases for --dir
s
tat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dir
s
tat: In ca
s
e
of renames, use
t
arget filenam
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herlan
d
T
e
a
ch
--
d
irstat not to completely ignore rearran
g
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
oh
a
n Herland
--dirsta
t
-by
-
file: Make
it faster a
n
d
mo
r
e correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
--d
i
rstat: Describe non-obvious diffe
r
en
c
es relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herla
n
d
Make "g
i
t notes add" more user-friendly
w
hen there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
land
log/pretty-option
s
: D
o
cument --[no-]
n
otes and depre
c
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/checkout --track: Ensure that
u
ps
t
ream
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
ohan Herlan
d
pus
h
.
default: Rename
'tracking
'
to
'
upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
rovide
'
git
mer
g
e
-
-abort' a
s
a synonym to 'git re
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
cmd_me
r
ge():
Parse options b
e
fore
c
hecking
M
ERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
erland
Provide 'git
notes get-ref' to e
a
s
i
ly re
t
rieve curren
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git no
t
es merge: A
d
d
t
estcases for merging notes t
r
e
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
g
i
t
notes me
r
ge
:
Add anothe
r
auto-resolvi
n
g strateg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
n
o
tes mer
g
e: --com
m
i
t should fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git
notes merg
e
: List conflict
i
ng n
o
tes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
gi
t
notes
m
erge: Manual conflict resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
la
n
d
git notes merge: Manual conflict resolut
i
on, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
Documentati
o
n
:
P
reliminary
docs on 'git notes
merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes mer
g
e
: Add aut
o
matic conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge: Handle real,
non
-
conf
l
i
cting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
bui
l
tin/
n
otes
.
c: Refact
o
r cr
e
ation of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
i
t
n
otes me
r
ge: Initial implem
e
n
tation handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herlan
d
buil
t
in/notes
.
c: Sp
l
it notes ref
DWIMmer
y
into a separa
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
note
s
.
c:
Us
e
two newl
i
nes (instead of one)
when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
(trivial) t
3
303
:
Indent with
t
abs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herland
notes
.
h/c: Propagate c
o
m
b
ine_notes_fn return valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
H
e
rland
n
ot
e
s
.
h/c: Allow combine_notes fun
c
tions to r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
no
t
es
.
c
: Reorde
r
functio
n
s
in preparation for
n
ext
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
notes
.
h: Ma
k
e default_notes_ref() av
a
ilab
l
e
i
n
notes A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
(tr
i
vial)
n
o
t
e
s
.
h:
Mi
n
or
documentation fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
not
e
s
.
c: Hex
i
fy
S
H
A
1 in die() message from init_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joha
n
Herla
n
d
n
o
tes: Don't create (e
m
pt
y
) commit w
h
e
n
removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
En
a
ble custom schemes for
c
olum
n
color
s
in
t
he g
r
a
p
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Her
l
a
nd
M
ake graph_next_line()
av
a
ilable in the g
r
aph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
revision: Tur
n
off hi
s
tory s
i
mplification in --anc
e
st
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
a
n
d
re
v
ision:
F
ix typo in
--ancestry-
p
ath error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
D
ocumentation
/
rev-li
s
t-options
.
txt: Explain --an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/r
e
v-list-optio
n
s
.
txt: Fix mi
s
sing l
i
ne
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
dif
f
.
c
:
Ensure "index
$
from
.
.
$to" line contains unamb
i
guous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
han Herlan
d
bu
i
lti
n
-notes:
M
inor (mostly parse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
Herland
subm
o
dule sum
m
a
r
y
:
D
o
n't bar
f
when invok
e
d in an
em
p
ty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
uiltin-no
t
es: Add "cop
y
"
subcomman
d
for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
bui
l
tin-notes: Mis
c
.
refactoring of argc
a
nd
e
xit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add -c
/
-C options for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
nd
bui
l
tin-notes: Refactor handling
o
f -F
option
to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-no
t
es: Deprecate the -
m
/-F
o
p
tions
for
"
g
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
l
t
in-notes: Add "app
e
nd" sub
c
o
m
mand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Add "add" su
b
command for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
bu
i
l
tin-
n
otes: Add
--me
s
sage/--file alias
e
s for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
bui
l
tin-notes:
A
dd "list" sub
c
ommand for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
l
and
D
ocumentati
o
n: Generalize
g
it-notes docs to 'o
b
jects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
nd
builtin-notes: Ad
d
"prune" subcommand for
r
emoving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
N
o
tes A
P
I: prune_
n
otes(): Prune no
t
e
s
t
hat b
e
long to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
t3305: Verify that removin
g
notes triggers aut
o
matic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
builtin-notes:
A
dd "remove" subcomman
d
fo
r
removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
Teach
builtin
-
notes
to
remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
not
e
s code to properly pr
e
se
r
ve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t330
5
: Ve
r
ify t
h
at
a
dding many notes with
g
it-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
t330
1
: Verify successful
a
nnotation
o
f
n
o
n
-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
Builtin-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
Refact
o
r notes c
o
ncat
e
nation into a flexib
l
e
in
t
erface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
Notes API: Allow multip
l
e
concurrent
notes trees w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
Notes
A
P
I: writ
e
_no
t
es
_
tre
e
():
Stor
e
t
h
e
n
otes
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next