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
Git 1.7.5.2
2011-05-13
Johan H
e
rlan
d
t
5
4
00: Fix a couple of typ
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
a
n Herland
-
-
d
ir
s
t
a
t: In case
of renames, u
s
e targ
e
t filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Tea
c
h
-
-
d
irstat not
t
o com
p
l
etely igno
r
e rea
r
ranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
land
--di
r
st
a
t-by-file
:
Make it f
a
ster and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--d
i
rs
t
at: Describe non-obvious di
f
ferences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/checkout
--track:
E
n
s
ure that upstrea
m
b
r
anch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
default
:
R
e
na
m
e
'tra
c
king' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Prov
i
de 'gi
t
merge --abort' as a syn
o
nym to
'
g
i
t reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
cmd_merge(): Parse op
t
ions before checkin
g
M
E
RGE_HEA
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
la
n
d
Provide
'
git
n
ot
e
s get-ref' to eas
i
l
y retrieve c
u
r
rent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n
Herland
git notes merge: Add testcases for merging n
o
t
e
s
t
r
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
git not
e
s merge: Add
a
noth
e
r auto-resolving s
t
rate
g
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t no
t
e
s
merge
:
--comm
i
t sho
u
ld fa
i
l
i
f underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
git notes mer
g
e: List c
o
n
flicting notes i
n
notes
m
e
rge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
merg
e
: Manual conflict
resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
merge: M
a
nual conflict resolu
t
ion,
p
art 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentat
i
on
:
Preliminary docs on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
and
g
i
t notes m
e
rge: Add automati
c
confl
i
ct resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes me
r
g
e: Handle real, non
-
confl
i
cting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
buil
t
i
n
/
n
otes
.
c
: R
e
f
a
c
t
or creation
o
f n
o
tes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
no
t
es merge: I
n
itial implem
e
ntation handling
t
rivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bu
i
lti
n
/notes
.
c
:
Spl
i
t no
t
es ref D
W
IMmery
i
nto a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
no
t
es
.
c
: Use two ne
w
lin
e
s (
i
nste
a
d of one) when concatena
t
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial)
t3303: In
d
ent with tabs instea
d
of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
nd
notes
.
h/c
:
Propagate co
m
bin
e
_notes_fn
r
e
turn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/
c
:
Allow combine_note
s
f
u
nc
t
i
o
ns
t
o
rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
not
e
s
.
c: Reorder
functions
in pr
e
parati
o
n for
n
ext
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
no
t
es
.
h: Make de
f
ault_notes_ref() av
a
i
l
a
ble
in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
(
trivial)
notes
.
h: Minor do
c
ument
a
tion fixes to
c
opy_not
e
s
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
n
o
t
es
.
c: Hexify SHA1 in d
i
e() message
f
rom init
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
n
otes: Don't c
r
e
ate (e
m
pty) com
m
it when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n Herland
Enable custom sc
h
emes f
o
r
column co
l
ors i
n
the graph
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n
H
e
r
land
Make graph_next_
l
ine() avail
a
b
l
e
i
n
t
he
graph
.
h
AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
r
land
revision: Turn off h
i
story simplification in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
revision: Fix typo in --ancestry-
p
at
h
err
o
r
mess
a
ge
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
ha
n
Herland
Documentation
/
rev-list-
o
ptions
.
tx
t
: Explai
n
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev
-
l
ist-options
.
txt
:
F
ix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c:
E
n
s
ure
"
in
d
ex
$from
.
.
$to" line contains unambiguou
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan He
r
land
builtin-notes: M
i
n
o
r
(
mo
s
tly parse_
o
ptions-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an
Herlan
d
submodule summary:
D
on't barf wh
e
n
i
nvoked i
n
an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Add "copy" su
b
command
f
or
copying no
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
buil
t
i
n
-not
e
s:
Misc
.
refactor
i
ng of a
r
gc a
n
d exit val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
bui
l
ti
n
-notes:
Add -c/-C opti
o
ns for r
e
usi
n
g notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
bu
i
ltin-notes: R
e
factor h
a
n
d
l
i
ng of -F option to
a
llow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin
-
n
o
te
s
:
D
e
precate
the -m/-F
o
ptions for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-notes: Add "append" subcommand for ap
p
e
n
d
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "add" subcom
m
a
n
d for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
builtin-notes: Add --message/--file a
l
iases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-notes
:
Add "list" su
b
command fo
r
listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Documentation: Generaliz
e
g
i
t-n
o
tes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
H
erland
builtin-n
o
tes:
A
d
d "pru
n
e"
s
ubcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
N
o
tes API: prune
_
note
s
(): Prun
e
n
o
tes
t
h
a
t belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
H
erlan
d
t
3305: Verify
that removing
n
ote
s
triggers auto
m
atic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
a
nd
builti
n
-notes:
A
dd
"
remove" subc
o
m
man
d
f
o
r r
e
moving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Tea
c
h bu
i
ltin-n
o
tes to remove empty
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rl
a
nd
Tea
c
h n
o
tes c
o
d
e to prop
e
rly
preserve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
an
d
t3305: Verify that ad
d
ing ma
n
y notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t33
0
1:
Verify successf
u
l annotatio
n
of no
n
-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Buil
t
i
n
-i
f
y git-note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Refactor
n
o
t
es concatenation
i
nto a flexible in
t
erface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Note
s
API: Allow
m
ultiple concurrent notes tr
e
es with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
He
r
land
Notes API: write_notes_t
r
ee(): Store the notes t
r
ee
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Her
l
and
N
otes API: for_
e
ach_note(): T
r
ave
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_not
e
(): Retu
r
n th
e
n
o
t
e
a
n
n
o
tat
i
ng the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: re
m
ove_not
e
(): Remo
v
e
n
o
t
e
obje
c
ts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API: add_no
t
e(): Add note ob
j
ect
s
to
t
h
e
internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Not
e
s
A
PI
:
init_not
e
s(): Ini
t
ia
l
ize
t
he notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Ad
d
t
e
sts for checking cor
r
ect
h
and
l
ing of
$
GIT_
N
OT
E
S_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
nd
Notes API: g
e
t_co
m
mit_notes() -
>
format_note() + rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosmetic
fixes
t
o
n
otes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan He
r
land
builtin-
c
on
f
i
g
:
Fix crash
when using "-f <re
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
ha
n
H
erland
A
d
d mo
r
e testcases to test fas
t
-imp
o
rt of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Herlan
d
Renam
e
t9301 to t9350,
t
o make room for more fast-
i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan H
e
rland
fast-import: Proper no
t
es tre
e
manip
u
lation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joha
n
Herland
Fix crasher on en
c
ountering SHA1-like non-note in
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan
H
erland
Basic
b
u
il
d
infrastructu
r
e fo
r
Python script
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
oha
n
Herland
Add selftests verifying conca
t
enation of
m
ultiple note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
R
e
fa
c
tor notes code to conc
a
tenat
e
multi
p
le n
o
tes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herla
n
d
Add
s
elftests verifying that w
e
can pars
e
n
o
t
es
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
l
and
Teach
t
he
no
t
es
lookup co
d
e to
parse
n
otes tre
e
s with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
Teach no
t
e
s
code to free
i
t
s inter
n
al data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Her
l
and
A
d
d flags t
o
get_
c
om
m
it
_
n
otes()
t
o
contro
l
the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
t
3
302-notes-in
d
ex-expensive: Speed up create_repo
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
f
a
st-imp
o
rt:
Add support for i
m
p
o
rtin
g
comm
i
t notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Teach "-m <m
s
g>" an
d
"-F <
f
ile>" to "git n
o
tes edi
t
"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
o
h
a
n Her
l
a
nd
git clone: Add
--rec
u
rsive to au
t
omatical
l
y ch
e
ckout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan He
r
land
t
7
4
07: Use 're
v
-parse --s
h
o
r
t' rather than
bas
h
's s
u
bstrin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
H
erland
git submodule stat
u
s: Add --recursive to recurs
e
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herland
git
submod
u
le
u
pdate: Int
r
oduce
-
-recursive
t
o
u
p
date
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herlan
d
git submo
d
ule fore
a
ch: Add --recursive to recu
r
se into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herlan
d
git submod
u
le f
o
reach: test acc
e
ss to submodule n
a
me
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an Herland
Add
s
elftest for 'gi
t
subm
o
dule foreach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
g
it
submodule: Cle
a
nup usage string and ad
d
option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Jo
h
an
Herland
git s
u
b
m
odule foreach
:
P
r
o
vide
acc
e
ss
to
submod
u
le
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan Herland
h
e
lp
.
c: give correct st
r
ucture
'
s siz
e
to memset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
J
o
han H
e
rland
quic
k
fetch(): P
r
eve
n
t
overflow of
t
h
e
rev-
l
i
st c
o
mmand
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
g
i
t-submodule: add
s
uppor
t
for --merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan
Herlan
d
Rename submodule
.
<name>
.
rebase t
o
submodule
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
J
o
han Herland
Update
docs on behaviour
o
f
'
core
.
share
d
R
eposito
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
Move chm
o
d
(foo
,
0444) into move_temp_t
o
_
f
i
le()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next