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
Provide 'git merge --abort' as a synonym to 'git reset --merge'
2010-11-17
Johan Herland
Provide 'git merge
-
-
abort' as a synonym to 'git
reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
cmd_merge(
)
:
P
arse options
b
efore
c
hecking MER
G
E
_
H
EAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git
n
otes get
-
r
e
f
' to
easi
l
y
retrieve c
u
r
rent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
i
t notes merge: Add testcases for me
r
g
i
ng no
t
es trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erland
g
i
t notes merge: Add another auto-resolvin
g
strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes
m
erge: --commi
t
should fail i
f
u
n
derlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
git notes mer
g
e: List conflicting not
e
s
i
n notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git
notes
merge: Manual confli
c
t
resolution,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
gi
t
notes merge: Manual conf
l
ic
t
r
e
solut
i
o
n, pa
r
t 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herland
Do
c
umen
t
ation: Prelimi
n
ary docs on 'git notes mer
g
e'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
git no
t
es
m
erge: Add automatic conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n Herland
git
n
otes
mer
g
e
:
Han
d
le r
e
al, non-conflic
t
i
ng notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herl
a
nd
b
u
iltin/notes
.
c: Refactor
c
rea
t
ion of
n
o
t
es commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes merge: Initial imple
m
entation handling trivia
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erland
builtin/not
e
s
.
c: Split
n
otes r
e
f DWIMmery
into a
separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
notes
.
c: Use two newlines (instead of one) when co
n
catena
t
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
land
(trivial) t3303:
Indent
w
i
th tabs instead of spac
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Propagate combine_notes_fn retu
r
n valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
otes
.
h/c: Allo
w
combine_notes f
u
nctions t
o
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
c: Re
o
rder functions i
n
preparatio
n
for ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herla
n
d
notes
.
h: Make default_notes_r
e
f() available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
(trivial) n
o
tes
.
h: Minor documentation
fix
e
s to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Hexify SHA1 in die()
m
essage f
r
om ini
t
_note
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
revisi
o
n
:
Turn off history
simp
l
ifi
c
ation in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herlan
d
revision: Fix
typo i
n
--ancestry
-
pa
t
h error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
Documentation/rev-list-option
s
.
txt
:
Explain --an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herla
n
d
Doc
u
m
entation
/
re
v
-
list-op
t
i
ons
.
txt: Fix missing l
i
ne
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herlan
d
diff
.
c: Ensure "index
$
from
.
.
$
to" lin
e
contains
u
nambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
an
Herland
b
u
iltin-notes: Minor
(mos
t
ly
p
arse_options-
r
elate
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submo
d
ule summary: Don't barf w
h
en invoked
in an
e
mpty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes: Add "copy" sub
c
ommand for copying no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
built
i
n-notes: Mis
c
.
refactorin
g
of argc and
exit
v
a
lue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
He
r
land
bui
l
tin-notes: Add
-
c/-C options for reusing
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Refa
c
tor handling of -F optio
n
to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
ltin
-
notes: Dep
r
ecate the
-m/-F optio
n
s for
"
git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-note
s
:
A
dd "append" subcommand for
appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
lan
d
bu
i
lti
n
-notes: Ad
d
"add" subcommand for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes: Add --message/--file al
i
as
e
s fo
r
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
builtin-notes: A
d
d
"
lis
t
"
s
ubcom
m
and f
o
r listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
D
ocumentati
o
n:
G
e
n
e
ralize
g
i
t-notes doc
s
to 'o
b
j
e
c
ts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
and
buil
t
in-notes: Add "prune" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
p
rune_notes(): Prune note
s
that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
t
3305:
V
e
r
i
fy that remo
v
ing
notes tri
g
gers
automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herland
builtin-n
o
tes: Add "remove" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Tea
c
h builtin-notes to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach notes code t
o
p
r
o
perly preserve
n
o
n
-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t3305: Ver
i
fy that
a
dding many notes wi
t
h git-
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t3301:
Verify successful ann
o
tation of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
Builtin-if
y
git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Refactor not
e
s concatenation into a flexible
interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
No
t
es API:
A
llo
w
multiple concurr
e
nt no
t
e
s
trees w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
Notes API:
w
rite_not
e
s_tree(
)
:
Store the notes
t
ree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erla
n
d
N
otes API: f
o
r_eac
h
_note()
:
Trav
e
r
s
e th
e
entire n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
H
e
r
lan
d
Notes API: ge
t
_note(): R
e
turn the note annotating
the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API: remove
_
note
(
): Remove note object
s
from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
Notes API:
a
dd_note():
A
d
d no
t
e
o
bjects to
t
h
e internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes
API: init
_
notes(): I
n
i
t
ialize the notes tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
Add te
s
ts
f
or checking correct handling of $GIT_NOTES_
R
EF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
: get_commi
t
_
n
otes()
-> f
o
rmat
_
note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
Minor cosmetic fixes to
notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
ohan He
r
la
n
d
buil
t
i
n
-config:
F
ix crash when us
i
ng
"-f
<r
e
la
t
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herla
n
d
Add more testcases
t
o
t
e
st
fast-i
m
port of not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
Rename
t
9301 to t9350, to make room for mor
e
fast-im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Her
l
and
fast-import: Pro
p
er note
s
tree manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix cras
h
er on e
n
c
o
unt
e
ring SHA1-like no
n
-note in no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Her
l
and
Bas
i
c build infrastructur
e
for Python script
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an
H
erl
a
nd
A
d
d
s
elftests
verifying
c
on
c
atenat
i
on of multiple
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
Ref
a
ctor notes
c
ode to concatena
t
e
multiple not
e
s
an
n
ota
t
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Add selftests verifying that we can
p
arse
not
e
s trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach the notes looku
p
c
o
d
e
to par
s
e
n
otes tre
e
s wi
t
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach
notes co
d
e
t
o free
its internal data structure
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add flags to
get_commit_n
o
tes
(
) to co
n
t
r
ol the
fo
r
mat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
er
l
and
t
3
3
0
2
-no
t
e
s
-index-expensive: Speed up
c
reate_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
fast-import:
A
dd support
for im
p
orting
c
ommi
t
n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Her
l
and
Teach
"
-m <msg>" and
"-F
<
fil
e
>" to
"
git notes e
d
it"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git clone: A
d
d
-
-rec
u
r
s
ive to automaticall
y
chec
k
out
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herl
a
nd
t740
7
: Use
'
rev
-
parse
-
-
short'
rathe
r
t
h
an ba
s
h's substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
git
s
ubmodule status: Add --recu
r
sive to recurse int
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Her
l
an
d
git subm
o
d
u
le updat
e
: Introduce --recu
r
sive to update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
a
n
d
g
i
t
submodule fo
r
each: Add --recursive to recurse
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herla
n
d
git su
b
m
o
dule fo
r
eac
h
: test a
c
cess
to submodule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herlan
d
Ad
d
se
l
f
t
est for 'git submodul
e
fo
r
each'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule
:
Cleanup u
s
age string and add
optio
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan
Herland
git subm
o
d
u
l
e foreach: Pro
v
i
d
e access t
o
submo
d
u
l
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan
Herl
a
nd
help
.
c: give cor
r
ect st
r
uc
t
ure's size
to m
e
mset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Jo
h
an Herland
quickfetch(): Prevent ov
e
r
f
l
ow of th
e
r
e
v-li
s
t command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
git-submodule
:
a
dd s
u
pport
for --mer
g
e
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
Rename submodule
.
<name>
.
rebase
t
o
s
ubmodule
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
J
o
han Herland
Upda
t
e docs on beh
a
viour
o
f
'
c
ore
.
sharedRepository
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
J
o
han Her
l
and
Move chmod(foo
,
0444
)
into move
_
temp_to_f
i
le()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Jo
h
an H
e
rland
U
se st
r
chrnul()
i
n
s
te
a
d of strchr(
)
pl
u
s manual workarou
n
d
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Joha
n
Herland
Fix submod
u
le sync wit
h
relative submodul
e
URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Jo
h
an Herland
for-each-ref: Fix --f
o
rmat=%(subject) f
o
r
log message
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Joh
a
n
Herland
F
i
x As
c
ii
D
oc errors
i
n merge docu
m
entation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Joh
a
n He
r
lan
d
Bring local c
l
one's origi
n
URL in li
n
e with th
a
t of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Johan He
r
land
Teach "git diff -p" HTML funcname patterns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herl
a
nd
Te
a
ch "git clone" to pack ref
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan
H
e
rland
Prepare testsui
t
e for a "git
c
l
o
ne" that packs refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan
Herlan
d
Move pac
k
_refs(
)
and friends into libgit
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Incor
p
orate fetched
packs in fut
u
re
o
bject traver
s
al
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next