repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
sample pre-commit hook: use --bool when retrieving config var
2013-09-24
J
o
han Herland
sa
m
ple pre-commit
h
ook: u
s
e --bool when retrie
v
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han H
e
r
land
t
3
200: Add test demons
t
rating min
o
r
regre
s
si
o
n in
4
1c21f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
H
erland
Refer to
b
ranch
.
<name>
.
remote/
m
erge
w
hen documen
t
in
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200:
Minor fix when preparing for
tracking fai
l
u
r
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t2024: Fix &&-chainin
g
and a couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move
c
rea
t
e_
n
otes_commit(
)
from
n
o
tes-merge
.
c i
n
t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan
H
erland
Move cop
y
_note_for_rewrite
+
friends f
r
om builtin/n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herla
n
d
finish_copy_notes_fo
r
_rewrite(): Let caller provide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
glossary
:
Update
and re
p
hra
s
e
the definit
i
on o
f
a remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
bra
n
ch
.
c: V
a
lidate t
r
a
cki
n
g
b
r
anches wit
h
refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herl
a
nd
t9114
.
2
: Don't
use --track opti
o
n against "svn-r
e
mote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t72
0
1
.
24: Add refspec to keep -
-
tra
c
k
working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
e
rland
t3200
.
39: tracking setup sh
o
u
l
d
f
ail i
f
ther
e
is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: Use remote refspecs when DWI
M
mi
n
g tra
c
kin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t
2024: Show fail
u
re
t
o use refspec when
D
W
IMming
r
emo
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
ha
n
Herlan
d
t2024:
Add te
s
ts verifying cur
r
ent DWIM behavior of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n
Herla
n
d
git
s
y
mbolic-ref
--delet
e
$symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan
Herland
F
ix failure
t
o
d
el
e
te a pack
e
d r
e
f th
r
ough
a
symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an
H
erland
t1400-updat
e
-ref: Ad
d
test
v
er
i
fying bug with symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herla
n
d
no
t
es-merge: Don't
r
emo
v
e
.
git/NOTES_MERGE_W
O
RKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-m
e
rge
:
u
se o
p
endi
r
/rea
d
dir instead of using read_dir
e
c
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
o
h
an Herlan
d
t3310: illustrate failure to
"
note
s
merge --commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
er
l
and
f
a
st-im
p
or
t
: Fix incorrect fanout level when mo
d
ifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herland
t9301: Add 2
n
d
t
estca
s
e exposing b
u
g
s in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Fix testcase cove
r
ing up
a b
u
g
in
f
ast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rlan
d
t5400: Fix a couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dirstat error
m
es
s
ages for
translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
I
m
prove err
o
r handling wh
e
n
p
arsing dirstat parameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
N
e
w --dirstat=lin
e
s mode, doing dirsta
t
an
a
lysis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow
s
pecif
y
in
g
--dirstat cut-off per
c
entage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Add config variable for
s
p
ecify
i
n
g default --
d
irstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor
--dirstat parsing; dep
r
ecate --cumula
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
a
n
d
Make
--dirstat=0 output directories
that contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Add sev
e
ral testcases for --dirsta
t
and
frien
d
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--
d
irstat: In case of
renames, use target fil
e
n
ame
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
Teach --dirsta
t
not to completely igno
r
e
rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erlan
d
--dirstat-by-file: Make it fast
e
r
an
d
m
ore correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an
Herland
--di
r
s
t
at: D
e
s
c
ribe
n
on-obviou
s
d
i
f
ferences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Herland
Make
"
git notes
a
dd" mo
r
e user-
f
riendl
y
when
there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herla
n
d
log/pretty
-
o
pt
i
ons: Document -
-
[no-
]
n
o
te
s
and deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Joha
n
H
erla
n
d
branch/checkout --track:
Ensure that ups
t
ream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herla
n
d
push
.
default: Rename 'tr
a
cking' to 'upst
r
eam'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n Herland
Provide
'
gi
t
merge --abort' as a synonym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
cmd_merge(): Parse
o
ptions bef
o
re checking MERG
E
_
HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
P
r
ovide 'g
i
t notes get-ref
'
to e
a
sily
retrieve cu
r
ren
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes m
e
rge: Ad
d
testcases for merging notes
trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes
m
erge: Add ano
t
her auto-res
o
lving str
a
tegy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git
n
o
t
e
s me
r
ge: --commit shou
l
d fail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
git notes m
e
r
g
e: List co
n
f
l
icting notes i
n
notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
git notes me
r
ge: Manua
l
conflict r
e
solution, pa
r
t 2/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
erlan
d
g
i
t
n
otes merge: M
a
n
ual conflict res
o
l
u
tion, pa
r
t 1/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Docum
e
n
tation: P
r
eliminary d
o
c
s
on
'
git notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes me
r
ge:
Add
a
u
t
omati
c
c
o
nflict resol
v
e
rs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
gi
t
notes merge:
H
andle
real, non-con
f
licting
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
and
builtin/note
s
.
c: Refactor cre
a
ti
o
n of notes c
o
mmits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git
n
otes merge: In
i
t
ial implementation handling triv
i
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
bu
i
ltin/
n
otes
.
c: Spli
t
n
o
tes ref
D
WIMmery into a sepa
r
ate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erland
notes
.
c: Us
e
t
w
o
newlin
e
s
(ins
t
ead o
f
one
)
w
hen concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Her
l
a
n
d
(t
r
ivi
a
l
) t33
0
3
:
Inden
t
wit
h
tab
s
ins
t
ead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
land
notes
.
h/c: Pr
o
pagate
combine_notes_f
n
return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
not
e
s
.
h/
c
: Allow
combine_notes
functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erl
a
nd
notes
.
c:
Reord
e
r f
u
nctio
n
s in pr
e
para
t
ion for nex
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
l
a
nd
notes
.
h: Ma
k
e default_not
e
s_re
f
() avail
a
ble
i
n notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
(t
r
ivi
a
l) notes
.
h: Minor documentation
f
ixes t
o
c
opy_note
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
otes
.
c: Hex
i
fy SHA1 in
die() message
from init_no
t
es()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
J
oh
a
n Herland
notes: D
o
n't
c
reate (empty
)
com
m
it when removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herland
Enable custom sch
e
m
e
s
f
or co
l
umn color
s
in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_next
_
line() available in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
revi
s
ion: Turn off history simplification
in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
re
v
is
i
on: Fix t
y
po in
--ancestry-pat
h
error messa
g
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
Documentation/rev-list-opt
i
ons
.
txt: Exp
l
a
in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Do
c
umentation/rev-list-optio
n
s
.
t
x
t
: Fix
m
issing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Jo
h
an
Herland
diff
.
c: E
n
sure "
i
n
dex $from
.
.
$
t
o" line cont
a
ins
unambig
u
ous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herlan
d
b
u
ilti
n
-n
o
t
es: Minor (mostly
parse_option
s
-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan
H
e
r
land
subm
o
dule summary:
Don't b
a
rf wh
e
n invoked in
a
n
e
m
pty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uil
t
in-no
t
es: Ad
d
"
copy" su
b
command
f
or c
o
pying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
bui
l
tin-notes: Misc
.
refacto
r
ing o
f
a
r
gc and exit va
l
ue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin
-
n
o
tes: Ad
d
-c/-C op
t
ion
s
for reusing
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-
n
otes:
Refa
c
tor handling of
-
F
opti
o
n to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
He
r
land
builtin-
n
otes: De
p
recate the -m/-F options for "g
i
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-n
o
t
e
s
:
Add "append" subcommand for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
b
u
iltin-note
s
: Add
"add" subcommand for addi
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-
n
otes: A
d
d
-
-message/--file
a
liases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
bu
i
ltin-notes: Add "list" subc
o
mma
n
d f
o
r listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
Documentation: Generalize git-n
o
tes docs to 'ob
j
ects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
b
uilt
i
n-notes: Add "
p
rune" subcommand for rem
o
v
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes AP
I
: prune_note
s
():
P
rune notes
t
hat belong
to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
t3305
:
Verify that removing notes
triggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rla
n
d
builtin-note
s
: Add "remove"
s
u
b
command for r
e
moving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
Her
l
a
n
d
Teach builtin-notes to re
m
ove e
m
pty
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teac
h
notes
c
ode to properly preserve no
n
-note
s
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t3305: Ver
i
fy that addin
g
many notes with g
i
t
-
not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
t3301: Verify successful
a
nnotation of non-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
lan
d
B
u
ilt
i
n-ify git-not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
Refa
c
t
or notes c
o
ncatenation into a flex
i
ble inter
f
ace
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
Notes
API: Allow mul
t
iple co
n
current
n
o
tes
t
rees
w
it
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
N
o
t
e
s
A
PI: w
r
ite
_
notes_tree():
S
t
ore the
n
otes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
No
t
es API: for_each_note(): Traver
s
e the entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: get_note(): Re
t
ur
n
th
e
note anno
t
ating
the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API: remove_note(): Remove note obj
e
c
ts from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next