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
t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'
2013-04-21
Jo
h
a
n
Her
l
and
t2024: Ad
d
te
s
ts
v
e
rif
y
ing curre
n
t DW
I
M behavior
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan H
e
r
l
and
git
s
y
m
b
oli
c
-ref
-
-delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herl
a
nd
Fix fai
l
u
r
e to
delete a pac
k
ed ref
t
hrough a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t
1400-update
-
ref: Add test verifying bug with symr
e
fs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han Herland
notes-mer
g
e:
D
on
'
t r
e
move
.
git/NOTES_M
E
RGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han Herland
notes-merge:
u
se opendi
r
/readd
i
r instead of using r
e
ad_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
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
H
er
l
an
d
fast-import: Fix i
n
correct
f
ano
u
t
l
evel when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
erland
t9301: Add 2nd
t
e
st
c
a
s
e exp
o
sing
b
ugs in fas
t
-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9
3
01: F
i
x testca
s
e
cover
i
ng up
a
bu
g
i
n fast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Herland
t5
4
0
0
: F
i
x a co
u
ple
o
f
t
ypos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
Herlan
d
M
a
r
k
dirstat
error messa
g
es for translati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Improve
er
r
or handling whe
n
pa
r
sing di
r
s
t
at parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
N
e
w --dirsta
t
=
line
s
mode,
d
o
i
n
g dir
s
tat
analysi
s
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Allow specifyin
g
--dirstat cut-off percenta
g
e as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ad
d
config var
i
able for specifying defa
u
l
t
--dirsta
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Re
f
actor -
-
dirstat pars
i
ng; deprecate --c
u
m
u
lative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rla
n
d
Make --
d
i
r
stat=0 outp
u
t directories t
h
at contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
r
l
and
Add s
e
ve
r
al
t
estc
a
ses for --dirstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: In cas
e
of renam
e
s
,
u
se target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
Te
a
ch --dirstat not to comp
l
etely i
g
n
ore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--d
i
rst
a
t-by-file
:
M
a
k
e i
t
fa
s
ter and more corr
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han H
e
r
l
and
-
-dirstat: Describe non-obvious di
f
ferences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
erland
M
ake "git n
o
tes add" more user-fr
i
endly w
h
en
there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
h
an Herla
n
d
log/prett
y
-option
s
: Document --[
n
o-]notes
and d
e
precate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
ohan
Herland
bran
c
h
/checkout --
t
ra
c
k: Ensure that upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
ohan Herla
n
d
pus
h
.
defaul
t
:
Rename 'tracking' t
o
'up
s
tr
e
am
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herla
n
d
Prov
i
de '
g
it merge --abor
t
' as
a synonym to
'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
cmd_merge():
P
a
rse o
p
t
ions before checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
land
Provide 'gi
t
note
s
get-ref' to eas
i
ly
retrieve cu
r
rent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n
Herland
g
it notes me
r
g
e
: Add testcases for merging notes t
r
ees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes merge: Add another auto-resolv
i
n
g
strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
it notes merge: --commit sho
u
ld fail if under
l
yi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
n
d
git
n
o
t
es
merge: List confli
c
t
i
n
g
n
otes in notes m
e
rge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
git not
e
s merge: Man
u
al confl
i
ct resolution, part 2
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes me
r
ge:
Manual conflict resolution,
part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
D
ocumentati
o
n: Preliminary
d
ocs on '
g
it no
t
es me
r
ge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
not
e
s me
r
g
e: Add a
u
tomatic conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge: Handle re
a
l
, non-con
f
licting note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/n
o
tes
.
c:
R
e
f
actor cr
e
ation
of
notes
commit
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes me
r
ge:
Initi
a
l imp
l
emen
t
at
i
on handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
b
u
iltin/
n
otes
.
c
:
S
p
l
it not
e
s re
f
DWIMmery into a
separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
notes
.
c
:
Us
e
two newlines (ins
t
ead of one) when concaten
a
tin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
(triv
i
al) t3303: Indent wit
h
tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n He
r
land
n
o
tes
.
h/
c
: Propagat
e
combine_notes
_
fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
n
otes
.
h/c:
Allow comb
i
n
e_not
e
s functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
t
e
s
.
c
: Reorde
r
fu
n
ctions
i
n preparation fo
r
n
e
xt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Ma
k
e
default
_
no
t
e
s
_
ref() available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Her
l
and
(
trivial) notes
.
h: Minor
docume
n
tation f
i
xes
to c
o
py_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c:
H
e
xify S
H
A1 in die()
m
essag
e
f
r
o
m ini
t
_not
e
s
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
o
h
a
n H
e
rland
notes: Don'
t
create (empty) commit wh
e
n remov
i
n
g
non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Herland
Enable custom
s
chemes for column
colors
i
n
the graph
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Her
l
and
Make graph_next_l
i
n
e
() avail
a
ble in the gr
a
ph
.
h A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
revisio
n
: T
u
rn off
h
i
s
tory
s
implifica
t
i
o
n
in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
e
vision: Fix typo
in --an
c
est
r
y-p
a
th
e
rro
r
m
es
s
ag
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Doc
u
mentation/rev-
l
i
s
t
-option
s
.
txt: Ex
p
l
ai
n
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han He
r
land
Docu
m
e
ntation/rev-lis
t
-options
.
txt: Fi
x
missing lin
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
di
f
f
.
c:
E
ns
u
re
"ind
e
x $from
.
.
$to" l
i
ne contain
s
unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Joh
a
n Herland
builtin
-
not
e
s: Mi
n
or (mostl
y
parse_o
p
tions-rela
t
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herl
a
nd
submodule summary
:
Don't
b
ar
f
when
i
nvoked
in a
n
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "copy" subcommand f
o
r
cop
y
ing n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herlan
d
builtin-notes:
Misc
.
ref
a
ctoring of argc and
exit
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-n
o
tes: Add -c/-C op
t
ions for reusing n
o
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes:
R
e
facto
r
handling of -F
o
ption to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
bui
l
tin-notes: Deprecate the -m/-F options for
"
git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
ui
l
tin-not
e
s:
Add
"append" subcommand
f
o
r appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
u
iltin-
n
o
tes: Ad
d
"a
d
d" subcom
m
a
n
d
for adding
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add --message/-
-
file aliases f
o
r -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n
-notes: Ad
d
"list" subco
m
mand for listi
n
g
n
ote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herla
n
d
Documenta
t
ion: G
e
neralize git
-
notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Her
l
and
buil
t
in
-
no
t
e
s
:
A
dd "p
r
une" subco
m
mand for remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes
API:
prune_notes(): Prune notes that
belo
n
g t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
t3305:
V
erify that rem
o
ving
n
otes trigge
r
s automat
i
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
builtin-notes: Add "remove" su
b
c
ommand for r
e
moving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
r
l
and
Teach
built
i
n-note
s
to remove
empty n
o
t
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Teach no
t
es c
o
de to properly prese
r
ve
n
o
n-note
s
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
t
3
305: Verify that addi
n
g many note
s
with
git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301:
V
erify successful
a
nno
t
a
t
ion of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
Builtin-if
y
g
i
t
-not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
R
e
f
a
ctor
notes concatenation into a flexible interfa
c
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
la
n
d
No
t
es API: Allow multip
l
e concurrent n
o
tes
t
ree
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes
A
PI:
write_notes_tree():
St
o
r
e the notes
t
ree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: for_
e
ach_n
o
te(): Traverse th
e
entire
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
P
I: get_no
t
e(): Return the
note annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
Notes A
P
I:
r
e
m
ove_note(): Remove note ob
j
ec
t
s fr
o
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: a
d
d_note()
:
A
dd no
t
e obj
e
ct
s
to the inte
r
nal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: in
i
t_note
s
(
)
:
Initialize the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Add
t
ests
f
or checking correct
handling
of $GIT_NOTES_R
E
F
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
N
otes API
:
get_co
m
m
it
_
notes()
-> format_note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Minor c
o
sm
e
tic fixes to
notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builti
n
-config:
Fix crash when usin
g
"-f <r
e
lati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
h
an He
r
land
Add mor
e
testcases to test
fast-
i
mport of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n
H
erl
a
nd
Rename t930
1
to
t935
0
, t
o
make room for
m
ore fast-
i
mp
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herl
a
nd
fast-i
m
por
t
:
Proper notes tree
m
anipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
o
han Her
l
and
Fix crasher
o
n
e
n
c
o
u
n
tering
S
HA1-like non-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Her
l
and
Bas
i
c
build in
f
rastr
u
ctur
e
f
or Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
oha
n
Herland
Add selft
e
s
t
s
v
e
rif
y
ing conc
a
tenation of m
u
ltiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
Refactor notes code to concatenate multiple notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an
H
e
r
land
Ad
d
selft
e
sts verifying that we can parse notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herland
Tea
c
h
the
notes lookup cod
e
to pa
r
se n
o
tes tre
e
s with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next