repo.or.cz
/
git.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 '
g
it merge --abort' as
a
s
y
non
y
m
to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
c
md_
m
erge(): Pa
r
s
e
options before
c
heck
i
ng
M
ERGE_
H
EAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
P
r
ovide 'git n
o
tes get-ref' to easily
ret
r
ieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
g
it notes m
e
rge: Ad
d
te
s
tcases for
me
r
ging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
g
i
t
n
otes
m
erge:
A
dd a
n
other auto-resolving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes merge: --commit
s
houl
d
fa
i
l if underl
y
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes me
r
g
e
:
Lis
t
c
on
f
licting notes in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes merg
e
: Manual conflic
t
r
e
solution,
p
a
r
t 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
merge
:
Manual conflict reso
l
u
t
i
on, part
1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
D
o
cumentation: Prelimina
r
y docs o
n
'git notes
m
erg
e
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
rla
n
d
git no
t
es merge: Add
a
u
t
omatic conflict re
s
olvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes mer
g
e: Handle real, non-c
o
nflicting
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
er
l
and
builtin/notes
.
c:
R
e
fact
o
r
creation of note
s
co
m
mits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: I
n
itial implementa
t
ion
h
andling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
buil
t
in/notes
.
c: Split
no
t
e
s ref D
W
I
Mmery into a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
note
s
.
c:
U
se two newlines
(
inste
a
d of
one) when c
o
ncat
e
natin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(
t
rivial) t3303: In
d
ent with tabs instead of space
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
note
s
.
h/c: P
r
opagate com
b
ine_notes_fn
r
eturn value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
h/c:
Allow
c
ombin
e
_notes functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
notes
.
c:
Reorder
functions in
prepar
a
tion for nex
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
la
n
d
notes
.
h: M
a
ke
d
ef
a
ult_notes
_
ref() available in n
o
tes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(tri
v
ial) notes
.
h: Min
o
r do
c
u
m
entation fixes t
o
c
o
p
y_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
c: Hexif
y
SHA1 in die() message from init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revi
s
ion: Turn off h
i
story simplification in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
revision: Fix typo in
--a
n
ces
t
ry-path error
m
essage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Doc
u
m
e
ntation/rev-
l
is
t
-op
t
ions
.
txt: Expl
a
in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n
Herland
D
ocum
e
ntat
i
on/rev-lis
t
-options
.
t
x
t: F
i
x
mis
s
in
g
line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herl
a
nd
dif
f
.
c: Ensure "index $from
.
.
$to" line co
n
tains unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Her
l
and
builtin-notes: Minor (mostly pa
r
se_options-relate
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan H
e
rland
s
u
bmodule s
u
m
m
ary: D
o
n't barf
w
hen
i
nv
o
ked in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-notes: Add "copy"
subcom
m
and f
o
r copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
buil
t
in-notes
:
Mi
s
c
.
refactoring
of argc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-n
o
t
e
s
:
A
dd -c/-C options for
r
eusing n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
builtin-notes: Refactor handlin
g
of -F opt
i
on
t
o
a
llow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
bui
l
tin-notes: D
e
precate the -m/-F opti
o
ns for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
He
r
land
builtin-notes: Add "appen
d
"
subcommand for
a
ppending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rland
bu
i
ltin-notes: Add "
a
dd
"
subc
o
mmand for adding
n
o
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
b
uiltin
-
not
e
s: Ad
d
--message/--file ali
a
ses for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
bui
l
tin-note
s
: Add "list" subcommand for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Documentation: Gen
e
ra
l
ize git-notes d
o
cs to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes:
A
dd "
p
rune
"
s
u
bcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Notes AP
I
: prune_notes(
)
: Prune notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
t3305:
Verify that removing
notes trigge
r
s au
t
om
a
tic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes: Add
"
remove" subcommand for r
e
mov
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Teach builtin-notes t
o
remove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
T
e
ach notes code t
o
properly pre
s
erve n
o
n-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
t3305: Verify t
h
at
adding man
y
notes with g
i
t-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
t3
3
0
1: Verify suc
c
essfu
l
an
n
o
t
ation of non-
c
om
m
its
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Bu
i
ltin-ify git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Refactor no
t
es conca
t
enatio
n
i
n
to a fle
x
ible
i
n
terface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
Notes API: Allow multip
l
e concurrent
no
t
e
s
trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
Notes A
P
I: write
_
notes_t
r
ee():
Sto
r
e
the
n
ot
e
s tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
Notes
A
PI:
for_ea
c
h_note(): Trave
r
se the entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes API: get_
n
ot
e
(): Retu
r
n the note annota
t
ing the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
Notes API
:
rem
o
ve_not
e
():
R
e
mov
e
note
object
s
from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
Notes API: add_note(): Add
n
ote o
b
je
c
ts to the in
t
ernal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API: i
n
it_notes()
:
Initialize the note
s
tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
e
rland
Add tests fo
r
chec
k
ing corr
e
ct
handling
of $
G
IT_NOTES_RE
F
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes
A
PI: get_commit
_
not
e
s() -> format_note() +
r
e
m
o
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Min
o
r cosmetic fi
x
e
s
to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-
c
onfig: Fix crash when us
i
n
g
"
-f <rela
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Her
l
an
d
A
dd more te
s
tcases to test fast-im
p
ort of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n H
e
rlan
d
Re
n
ame t9
3
01 to t9
3
50, to make room for mo
r
e fast-impor
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan Herland
fast-import:
P
r
oper note
s
tree ma
n
ipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan
H
erland
Fix crash
e
r o
n
encount
e
ring SH
A
1-like non
-
note in note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Basic build i
n
fras
t
ructur
e
for Pyth
o
n scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
la
n
d
A
dd sel
f
test
s
v
e
rifying conca
t
enation of
m
ultiple no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herlan
d
Refac
t
or notes code to
c
o
n
c
atenate
m
ultiple notes annotating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herl
a
n
d
Add sel
f
tests verify
i
ng that we can p
a
rse n
o
tes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herlan
d
T
each the n
o
tes
l
ookup code to p
a
rse notes
t
rees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach
n
o
te
s
code to fr
e
e
i
ts internal
d
at
a
structures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
Add flag
s
t
o ge
t
_
c
o
mmit_notes()
to control the f
o
rmat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
t3302-no
t
e
s
-index-expe
n
sive: Spe
e
d up c
r
eate_repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan H
e
r
land
f
as
t
-imp
o
rt: Add supp
o
r
t for impor
t
ing commit notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
a
n Herland
T
each "-m <msg>" and "-F <file>" to "git notes edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git
c
lone: A
d
d --
r
e
cu
r
sive to autom
a
tic
a
lly chec
k
out
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
J
ohan
Herlan
d
t7407: Use 'rev
-
parse --short' rather than bash's
s
ubstrin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herla
n
d
git submodule stat
u
s: Add --recurs
i
ve to re
c
urse in
t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan He
r
land
git submodule updat
e
: Introduce
-
-
r
ecursive to update
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
gi
t
s
ubmo
d
u
l
e
foreach:
A
dd --recur
s
ive to recurs
e
into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git s
u
bmodule fore
a
ch: te
s
t ac
c
e
s
s to submodule name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han
He
r
land
Ad
d
selft
e
st for 'git
submodule foreach
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
oha
n
Herland
g
it submodul
e
: Cle
a
n
u
p us
a
ge
str
i
n
g
and add opt
i
on
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herland
git
s
u
bmodule forea
c
h:
P
rovide access
t
o submodule
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
J
ohan Herland
h
elp
.
c: g
i
ve correct structure's s
i
ze to
memset()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Johan
Her
l
and
quickfetch(): Prevent
o
v
er
f
low
of the r
e
v-li
s
t command
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herl
a
nd
git-submodule: add suppor
t
for -
-
m
erge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan H
e
rland
Rename s
u
bmodu
l
e
.
<
nam
e
>
.
rebase to submodule
.
<
n
am
e
>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Johan
H
erland
Update docs on behav
i
our of 'core
.
s
h
aredReposi
t
o
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Johan
Herland
Mo
v
e chmod(foo,
0444) into move_temp_to_file()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-29
Joha
n
Herland
Use
s
t
rchrnul() instead o
f
st
r
c
hr() plus manual workaro
u
n
d
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Jo
h
a
n
He
r
land
Fix submodu
l
e sync
with relative submodul
e
U
RLs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-25
Joh
a
n Herlan
d
for-each-ref: Fix
-
-
f
o
rma
t
=%
(
subject) for log mess
a
ge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-04
J
o
han
Her
l
an
d
Fix A
s
ciiDoc
errors in merge
d
ocumentation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-09-02
Johan Her
l
and
Bring loca
l
clone'
s
origin U
R
L
i
n line wit
h
that
of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-08-21
J
o
ha
n
Herla
n
d
Teac
h
"git diff -p" HTML fun
c
name p
a
tterns
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Jo
h
an Herland
Teach "git clone" to pack refs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
Joha
n
H
e
rland
Prepare te
s
tsuite for a
"
git
clone" tha
t
pack
s
re
f
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
J
o
h
a
n Herl
a
nd
Move pack
_
refs() and fr
i
ends int
o
libgit
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2008-06-19
J
oh
a
n
H
erland
Inc
o
rporate fetched packs in fu
t
ure ob
j
e
c
t traversal
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next