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
git.txt: de-emphasize the implementation detail of a ref
2011-05-13
Johan Herland
t
5
400: Fix a c
o
uple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
-
-
di
r
stat:
I
n
case of re
n
a
m
es, use targ
e
t
f
i
l
enam
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Her
l
and
Tea
c
h --dirstat
not to
c
ompletely igno
r
e rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-file: Mak
e
it faster a
n
d more
correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
oh
a
n Herland
--di
r
st
a
t: Describe non-obvious differences
r
elative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/checkout --track: E
n
s
u
r
e
that upstream
b
ranch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Joh
a
n
Herland
push
.
de
f
ault: Re
n
ame 'tracking' to 'upst
r
eam'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide
'
g
it m
e
rge --abort' as a synonym to 'gi
t
re
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
e
rland
cmd_merge():
Pa
r
s
e options
b
efore checkin
g
MERGE_
H
EAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Pr
o
v
ide
'git notes get-ref'
to eas
i
ly retrieve
current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes merge: Add testcases for merging
no
t
es
t
r
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
git
note
s
merge:
A
dd
a
n
other auto-resolvi
n
g strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Her
l
and
git
notes merge: --commit should fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s merge: List conflic
t
ing notes
i
n
notes me
r
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
and
git notes merge:
Manual conflict
r
esolution, p
a
rt 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git
n
o
tes merg
e
:
M
a
n
ual conflict resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
Documentation: Preliminar
y
docs on 'git notes merg
e
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
H
erla
n
d
gi
t
n
ote
s
mer
g
e:
Ad
d
auto
m
at
i
c con
f
l
i
ct
resol
v
ers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merge: Handle
r
eal, non-confl
i
cting
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
land
builtin/notes
.
c: Refactor creation of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge:
Initial imple
m
entation handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erlan
d
buil
t
in/
n
otes
.
c
: Spl
i
t note
s
r
ef DWI
M
mer
y
into
a
s
epa
r
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an H
e
rland
n
o
tes
.
c: Use t
w
o newlines (instead of one) w
h
en
conc
a
t
e
nati
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
(trivial
)
t3303: Indent with tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
notes
.
h/c: Propa
g
ate combine_notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herl
a
nd
notes
.
h
/
c:
A
llow combine_notes fun
c
tions
t
o
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
n
otes
.
c
: Reorder func
t
ions in preparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
oha
n
Herland
notes
.
h: Make defaul
t
_notes_r
e
f() available in n
o
t
es API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) n
o
te
s
.
h:
M
inor d
o
c
u
menta
t
ion
f
ixes
t
o copy_
n
o
t
es
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erlan
d
notes
.
c: Hexif
y
SHA1 in
die() me
s
s
a
ge fr
o
m ini
t
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan
H
erlan
d
notes: Don't c
r
e
ate (empty)
c
o
m
m
it when
r
emoving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n
Herland
Enable cust
o
m
s
ch
e
m
es fo
r
column colors
in the gr
a
ph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
H
erland
Make graph_n
e
x
t
_lin
e
() av
a
ilab
l
e in the graph
.
h AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erlan
d
revision: Turn off history s
i
mp
l
ific
a
tion
i
n --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
rland
revision: Fix typo
in --ancestry
-
pa
t
h err
o
r message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
Docu
m
entation/r
e
v-l
i
st-options
.
tx
t
: Explai
n
-
-
a
ncestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
Documen
t
ation/rev-lis
t
-opti
o
ns
.
txt:
F
ix missing li
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joha
n
Herlan
d
diff
.
c: Ensure "index $from
.
.
$
to
"
l
ine contains un
a
mbiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
h
an Herlan
d
buil
t
in-
n
otes: Minor
(
mostl
y
parse
_
optio
n
s
-relat
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
ha
n
Herland
sub
m
odule summary: Don't barf when
i
n
v
o
k
ed in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
buil
t
in-notes: A
d
d "copy" subc
o
m
mand fo
r
copy
i
n
g n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
bu
i
l
t
in-notes: Mi
s
c
.
refactoring
o
f
argc a
n
d
e
x
it
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
ti
n
-notes: Ad
d
-c/-C op
t
io
n
s for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uilti
n
-notes: Re
f
actor hand
l
ing of -F option
to
a
llow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
builtin-not
e
s:
D
eprecate
t
he -m/-F options for "
g
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
built
i
n-notes: Add "
a
p
p
end"
s
ubcommand fo
r
appen
d
in
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
buil
t
i
n-notes: Add "add" subcommand fo
r
adding
not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
builtin-note
s
:
Ad
d
--message/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
builtin-note
s
: Add "list" subcomma
n
d for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
Docum
e
n
tation: Ge
n
eralize git-notes docs to 'ob
j
ects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "prune" subcommand for
r
emovin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I
:
prune_notes(): P
r
une notes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t330
5
: Verify that removing not
e
s
t
rigger
s
aut
o
mat
i
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
built
i
n-not
e
s: Add "r
e
mov
e
"
s
ubcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
Tea
c
h buil
t
in-no
t
es to remove empty
n
o
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
Teach notes code to
properly
p
r
eserve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
t3305: Verify that adding many no
t
e
s
wi
t
h
g
i
t-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
H
e
rland
t330
1
: Verify succes
s
ful annotation of
n
on-c
o
mmi
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Buil
t
in-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n
H
erl
a
nd
Refactor
notes con
c
a
tenation
in
t
o a fl
e
xible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
t
es API: Allow multiple concur
r
en
t
no
t
e
s
trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes AP
I
:
write_notes
_
tree(): Store
t
he notes tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
Notes API: for_each_note
(
): Traverse the entire
n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Not
e
s
API: get_note(): Return the note annotati
n
g the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Not
e
s API: remove_n
o
te(): Remove n
o
te objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes
A
PI: add_note(): Add note objec
t
s to
t
he i
n
ternal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
No
t
es API:
init_notes(): In
i
tial
i
ze the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Add tes
t
s
for che
c
k
i
n
g c
o
r
r
ect h
a
nd
l
ing o
f
$GIT_NO
T
ES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
No
t
es
A
PI: get_commit_notes() -> f
o
rmat
_
note(
)
+ remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
M
i
n
o
r cosmet
i
c fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joha
n
Herl
a
nd
builtin
-
config:
F
i
x
crash when us
i
n
g "-f <
r
elative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
A
d
d more testcases t
o
test
f
ast-impo
r
t of no
t
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n He
r
l
a
n
d
Ren
a
me t9301 to
t9350,
t
o
m
a
ke
r
oo
m
for
m
ore fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Herlan
d
fast-import: Proper notes tr
e
e manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joh
a
n Herland
F
ix crash
e
r on encounterin
g
SHA1-like non-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Jo
h
an Herland
Basic build infrastructure f
o
r Python sc
r
ipts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add selftest
s
verifying concat
e
nation of multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Ref
a
ct
o
r notes code to concatenate multipl
e
notes anno
t
ating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
A
dd selftests verifying that
we c
a
n parse notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
T
e
ach the notes loo
k
up code
t
o parse
n
otes
t
rees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
T
each notes co
d
e to free i
t
s internal
d
ata
s
t
ructures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Add flags to get_com
m
it_notes() to control the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an
Herland
t3302-notes-index
-
expensiv
e
: Speed
u
p create_r
e
po()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fa
s
t-impor
t
: Add suppo
r
t for im
p
o
r
ting comm
i
t
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teac
h
"-m
<
m
s
g
>" and "-F <file>" to "git n
o
tes
edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Joh
a
n
Her
l
and
g
i
t clone: Add --
r
ecur
s
ive to automatically
c
heckout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herla
n
d
t
7
407: Use '
r
ev-pars
e
-
-short' rather
than
b
ash's su
b
string
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submo
d
ule status:
Add
-
-recursive t
o
recurs
e
int
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herla
n
d
git submodule u
p
d
a
te: Introduce -
-
r
ec
u
rsive to
update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git
s
ubmodu
l
e
foreac
h
: Add --recu
r
sive t
o
recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
Herland
git s
u
bmod
u
le foreach: test a
c
cess to s
u
bmodule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
Add selftest for 'git su
b
module foreach
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git subm
o
dule: Cleanup u
s
age string and add op
t
ion
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herland
gi
t
subm
o
dule foreach: Provide
a
ccess
t
o su
b
module
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan Her
l
and
help
.
c: g
i
v
e
correct structu
r
e's
s
i
z
e to memset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Joh
a
n Herlan
d
quickf
e
tch(): Prevent overflow
of
the
r
e
v-list com
m
and
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
ohan Herla
n
d
git-submodule: add s
u
pport f
o
r --merg
e
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
o
han Herland
Ren
a
me
s
ubmodule
.
<name>
.
rebase to
submodul
e
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Joh
a
n Herland
U
p
date do
c
s on behaviour of 'core
.
sh
a
redRepository
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
M
o
ve chmod(foo,
0444) into mo
v
e
_
t
emp_to_file()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next