repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Provide 'git notes get-ref' to easily retrieve current notes ref
2010-11-17
Johan Her
l
and
Provide 'g
i
t
n
otes
get-
r
ef' to eas
i
ly r
e
trieve
current
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git
n
otes merge
:
Add
t
est
c
ases for m
e
rging n
o
tes tree
s
.
.
.
-
Junio C Hamano
: Portability: Don't string-compare...
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git note
s
merge: Add an
o
ther a
u
to-resolving
s
t
rategy
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merg
e
:
--commit should fail if under
l
yi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes merge: List
c
on
f
licting note
s
in not
e
s merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s me
r
g
e: Ma
n
ual
conf
l
ict reso
l
ution, part 2/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s merge:
Ma
n
ual conflict
r
e
s
o
lution, part 1/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
Docu
m
entat
i
on:
P
r
e
limi
n
ary do
c
s on 'g
i
t
n
o
t
e
s m
e
rge'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
g
it notes merge: Add au
t
oma
t
ic conflict resolvers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s mer
g
e: Handle re
a
l, no
n
-conflicting
n
otes
.
.
.
-
Junio C Hamano
: fixup minor style issues
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
b
ui
l
t
in/notes
.
c: R
e
f
actor c
r
eation of notes commits
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
n
otes m
e
rge: Initi
a
l imp
l
ementa
t
ion handling trivial
.
.
.
-
Junio C Hamano
: fixup minor style issues
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herl
a
nd
builtin/note
s
.
c: Split notes ref DW
I
Mmery i
n
to
a separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
erland
notes
.
c: U
s
e
two n
e
wlines (inste
a
d of
o
ne) w
h
en concatenatin
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
(trivial)
t3303: Indent with
t
abs
i
nstead of
spaces
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Propagate combine_n
o
t
es_fn
return value
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
notes
.
h/c: Allo
w
combine_note
s
function
s
to remove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
note
s
.
c: Reorder functions
i
n preparation for next
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n
Herland
no
t
es
.
h: Make d
e
fault_notes_ref(
)
available in notes API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) note
s
.
h: Min
o
r
d
o
cumentation fi
x
e
s
to
c
opy_notes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Hexif
y
SHA1
i
n die() mess
a
ge f
r
om init_notes(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Re
n
é Sch
a
rfe
notes: allow --dry-run for -n and
-
-verbos
e
for -v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Matt
h
ieu Moy
Docu
m
ent -B<
n
>[/<m>], -M<n> and
-C
<
n> variants of
.
.
.
from the explanations of
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Brad King
Documentation: cite git-a
m
f
rom git-apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Thomas Ra
s
t
t7003: fix subdirectory-fi
l
ter test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
t
han Nie
d
er
Allow
"
check-ref-format --branch" from subdi
r
ecto
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Ni
e
d
e
r
chec
k
-
ref-for
m
a
t: handle subco
m
mands in separate f
u
nc
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-05
Matt
h
ieu Moy
pretty-options
.
txt: match -
-
f
ormat'
s
documentation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
J
u
nio C
Hamano
Mer
g
e
b
r
anch 'sv/maint-dif
f
-q-clear-fix
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2010-08-03
Junio
C
Hamano
M
erge bran
c
h 'r
r
/s
v
n-fe' into maint
commit
|
commitdiff
|
tree
2010-08-03
Junio
C Hamano
M
e
r
g
e branch '
p
t/git-gui' into maint
commit
|
commitdiff
|
tree
2010-08-03
Ramkum
a
r Ramachandra
contrib/svn-fe: Add t
h
e svn
-
fe
target
to
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
R
a
mkumar Ramachandra
co
n
trib/svn-fe
:
Fix I
n
c
l
udePath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
M
erge branch 'ab/tap' into maint
commit
|
commitdiff
|
tree
2010-08-02
Æ
v
ar
A
rnfjörð
B
j
a
rmason
t
es
t
-li
b
:
R
em
o
ve 3
y
e
ar old n
o
-op --
n
o-python op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Ar
n
fjörð Bjarmason
t
est-li
b
: Ign
o
re
-
-quiet under a TAP harness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Juni
o
C Hamano
Merge
g
it
:
//repo
.
or
.
cz/g
i
t-gui
i
nto p
t
/gi
t
-gui
commit
|
commitdiff
|
tree
2010-08-02
Thomas Rast
D
ocument
a
tion/rev-parse:
q
u
oting is
r
e
quir
e
d
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
u
nio C Hamano
D
o
cumentation: reportin
g
b
ugs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Ham
a
no
Fix
D
I
F
F_QUEUE_
C
LEA
R
refactoring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
D
a
vid D
.
Kilzer
Fix
git rebas
e
--continu
e
to
w
ork with
t
ouched files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
Matthieu Moy
Docu
m
ent
l
s
-
files -
t
as semi-obs
o
lete
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Junio C
H
am
a
no
Git 1
.
7
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Junio C
Hamano
Sync with 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
J
un
i
o C Ham
a
no
Git 1
.
7
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Junio
C
Hamano
Sync
with 1
.
7
.
0 series
commit
|
commitdiff
|
tree
2010-07-27
Jun
i
o C Hamano
Git 1
.
7
.
0
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan
N
ieder
co
n
fig --get --path: c
h
eck for unset $HOME
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Stephen
Boyd
commit
:
rem
o
ve full stop
from usage help
f
or -u
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Matth
i
eu
M
oy
Clarify hel
p
mess
a
ge whe
n
n
o remote is specif
i
ed in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Makefile:
add check-doc
s
e
xceptio
n
for gitrevision
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Tho
m
as Rast
Fix
'
git
'
wrapper usag
e
string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
T
h
o
m
as
Rast
Docume
n
tation/
g
it-push: Ex
p
l
a
in s
t
a
tus o
u
tput i
n
m
o
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thom
a
s Rast
Doc
u
m
e
nt receive
.
denyDe
l
et
e
Current
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Cast
ex
e
cl*() NULL
s
entinels to
(
char *)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Nguyễ
n
Thái Ng
ọ
c Duy
git
-
read-tree
.
t
xt: a
c
knowledge the directory match
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
J
on
S
eymo
u
r
INS
T
ALL:
c
onfigur
e
/etc/xml/
c
at
a
lo
g
t
o build docs
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Johannes Sixt
t3700-add: fi
x
d
epende
n
ce on stdout and stderr bu
f
fering
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Brandon Casey
g
it-reb
a
s
e
--in
t
eractive
.
s
h
: use
printf in
s
tead of
e
cho
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Nathan
W
.
Pan
i
k
e
A
dd a goog
l
e-chrome option for web--browse
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merge branch 'main
t
-1
.
7
.
1' in
t
o
maint
commit
|
commitdiff
|
tree
2010-07-26
Junio
C
Hamano
Merge br
a
nch 'maint-1
.
7
.
0' into maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Jun
i
o C Hamano
Merg
e
br
a
nch 'maint-1
.
6
.
6'
into maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Ju
n
io C
H
aman
o
Merge branch 'maint-1
.
6
.
5' into
m
ain
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen Boy
d
request-pull
.
txt: Documen
t
-p option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Jun
i
o C Hamano
Me
r
ge bran
c
h 'maint-1
.
6
.
4' i
n
t
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Brock
m
an
Check size of p
a
th b
u
ffe
r
b
e
f
ore w
r
iting into
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Ju
n
io C
H
amano
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ha
m
a
n
o
tests:
correct "does reflog exist?" te
s
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
B
r
andon Case
y
t/
:
work around one-shot variable assignme
n
t with test_
m
ust_f
a
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
onathan Nieder
t/README
:
cor
r
ect an exc
e
ptio
n
w
hen breaking
a
&
&
ch
a
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
asey
t
/
{t5
5
4
1,
l
ib-httpd}: replac
e
problem
a
ti
c
'!
(
)' notation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
B
randon
C
asey
t/t3700: convert
t
wo uses of negation ope
r
a
t
or
'!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio C H
a
ma
n
o
M
e
rge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Ca
s
e
y
t/README: cl
a
ri
f
y te
s
t_mu
s
t_fail description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
Che
c
k size of path buffe
r
b
e
f
ore
w
riting into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
R
alf Th
i
elow
u
p
date-
s
erver-info
:
Shorte
n
read_pac
k
_info_
f
ile()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arn
f
j
ö
r
ð
Bjarmason
git add: Add --ignore-missi
n
g to SYNO
P
SIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Ar
n
f
j
örð Bjarma
s
on
g
it
submodule add:
R
emove old docs about implicit
-f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
git su
b
mo
d
ule
a
dd: Require
t
h
e ne
w
-
-f
o
r
c
e opt
i
on to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Juni
o
C Hamano
Merge
bran
c
h 'jl/add-n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
Da
v
i
d Aguilar
Documentation: Expl
a
in git-m
e
rget
o
ol'
s
u
se of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Juni
o
C Hamano
Merge branch 'jc/d
i
ff-me
r
ge-base-m
u
lt
i
'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
Only ru
n
a
ggrega
t
e-result
s
ove
r
a
c
tual
count
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Niede
r
Add
a
sample user
for the
svndum
p
l
ibrary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C H
a
m
ano
diff A
.
.
.
B: do n
o
t l
i
mit the syntax t
o
o narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merge branch 'jn/
p
a
ginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio
C
Hamano
Merge br
a
n
c
h 'wp/mer
g
e-
t
ree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'js/merge-rr-fix
'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io
C
Hamano
Merge bran
c
h 'jc/di
f
f-me
r
ge-base-m
u
lti'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merg
e
branch
'ns
/
mer
g
e
-
r
ecurs
i
ve-upt
o
date
'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Ham
a
no
Merg
e
branch 'jn/tests
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
M
e
rge branch
'
eb/doc-l
o
g-
m
a
n
page'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o
C Ham
a
no
Me
r
ge b
r
anch 'jn/gr
e
p
-open
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
n
o
Merge branch '
m
g/revi
s
io
n
-d
o
c'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Ham
a
no
Me
r
ge branch 'jk/maint-
s
t
atus-
k
eep-index-t
i
mestamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
mano
Merge branch 'jc/rebase-
i
-commit-msg-f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merg
e
branch 'ab/su
b
module-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
anch 'bc/mai
n
t-makefile-fixes'
commit
|
commitdiff
|
tree
next