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
git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
2010-11-17
Johan Herland
git notes merge
:
Add another auto-reso
l
v
ing
strategy
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git
notes merge: -
-
c
ommit should fail if underlying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erl
a
n
d
git n
o
tes merg
e
: List conflicting notes in
notes merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
git n
o
tes merge: Man
u
al confli
c
t re
s
olu
t
ion, par
t
2/2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git not
e
s merge: Manual conflic
t
resolution, part 1/2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Documentation: Preliminary docs
o
n 'git notes merge'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
git notes merge
:
Add automat
i
c
conflict resolver
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
tes merge: Handl
e
real, non-co
n
fl
i
cting notes
.
.
.
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
erland
bui
l
tin/n
o
tes
.
c: Ref
a
ctor creation o
f
n
o
tes comm
i
ts
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Initial
i
mplemen
t
at
i
on handling trivial
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builti
n
/notes
.
c
: Spl
i
t notes r
e
f DWI
M
mer
y
i
nto a se
p
arate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erland
notes
.
c:
U
s
e two newli
n
es (i
n
stead of one)
w
hen concat
e
na
t
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
(tr
i
vial) t3303: Indent with
tab
s
in
s
tead of spaces
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
notes
.
h/c: Pro
p
agat
e
co
m
bine_
n
o
tes_fn retu
r
n value
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
n
otes
.
h/c: Allo
w
co
m
b
i
ne_notes functions
t
o r
e
m
ove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
l
and
notes
.
c:
Reorder funct
i
o
n
s
in preparation for next
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
h
:
M
a
ke defaul
t
_not
e
s
_ref() available
i
n notes API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) notes
.
h: Minor do
c
ume
n
ta
t
ion fixes
t
o cop
y
_notes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n H
e
rland
notes
.
c: Hexify SHA1 in d
i
e() message from ini
t
_note
s
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
R
ené Scha
r
f
e
n
ot
e
s: allow --dry-run
for -n and --
v
erbose
for
-
v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Matthie
u
Moy
Document -B<n
>
[
/
<
m>], -M<n>
a
nd -
C
<n> vari
a
nts of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Brad Ki
n
g
Docum
e
ntation: cite git-a
m
from git-ap
p
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Tho
m
as
Rast
t7003: fi
x
subdirect
o
r
y-filt
e
r test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonath
a
n Nieder
Allo
w
"check-ref-format --branch" from subdirec
t
ory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
onath
a
n
Nied
e
r
check-re
f
-format: handl
e
sub
c
ommands in s
e
para
t
e fu
n
c
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
Matthieu
Moy
p
retty-op
t
ions
.
txt: match
--forma
t
'
s do
c
ume
n
tat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Haman
o
Merg
e
b
ranch 'sv/main
t
-diff-q-clear-fix' into maint
commit
|
commitdiff
|
tree
2010-08-03
J
unio
C
Hamano
Merge branch
'rr/svn-fe' into main
t
commit
|
commitdiff
|
tree
2010-08-03
Junio
C
Hamano
Me
r
ge branch
'
p
t
/g
i
t-gui
'
i
nto maint
commit
|
commitdiff
|
tree
2010-08-03
Ramkuma
r
Ramachan
d
ra
contrib/
s
vn-fe: Add the
svn-fe
tar
g
et to
.
g
i
t
i
gnore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Ramkumar Ramachandra
contrib/
s
v
n
-fe: Fix IncludePath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
J
unio C Hamano
M
erge b
r
a
n
ch 'ab/ta
p
' into ma
i
nt
commit
|
commitdiff
|
tree
2010-08-02
Ævar Ar
n
fjörð Bjarm
a
son
test-lib: Re
m
ove 3 year
o
l
d no-
o
p
--no-py
t
hon option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjörð Bjarmason
test
-
lib:
Ignore --quiet under a TAP harness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Juni
o
C Haman
o
Merge gi
t
://repo
.
or
.
cz/git-
g
ui into pt/git-gu
i
commit
|
commitdiff
|
tree
2010-08-02
T
h
omas R
a
st
Documentat
i
on/rev-par
s
e: quoting is required w
i
th
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio
C Hamano
Documen
t
atio
n
: reporting bug
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
J
uni
o
C Hamano
Fix DIFF_QUEUE
_
CLEAR refa
c
torin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
David D
.
Kilzer
F
ix git rebas
e
--
c
ontinue
t
o wo
r
k
with
t
o
u
ched files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
Matthieu Moy
Docu
m
ent ls
-
files -t
as
semi-obsolete
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Juni
o
C
H
a
m
a
n
o
G
it 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
Junio
C Hamano
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
Junio
C
Ha
m
a
no
G
i
t 1
.
7
.
0
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
config --get --
p
ath
:
check for uns
e
t $HO
M
E
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Stephen Boyd
commit: remov
e
full stop
f
r
o
m usage help fo
r
-u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Matthieu
Moy
Clarify help me
s
sage when
no remote is specified
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thoma
s
R
ast
M
a
k
efile: add
c
heck-docs
ex
c
eption for gitrevi
s
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thom
a
s R
a
st
F
i
x 'git'
wrapper usage
string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
T
ho
m
as Ras
t
Documentation/g
i
t-push: Expl
a
i
n
s
t
atus o
u
tput
in more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Ra
s
t
D
oc
u
ment
r
e
c
e
ive
.
denyDeleteCurre
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
T
h
omas Rast
Cast exec
l
*() NUL
L
se
n
ti
n
els
t
o
(
char *)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nguyễn Thái
Ngọc
D
uy
g
it
-
read-tree
.
tx
t
:
ac
k
nowled
g
e th
e
di
r
ectory
m
atching
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jon Seymour
INS
T
ALL:
c
onfigure /
e
tc/xml/catalog to build do
c
s on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jo
h
a
n
ne
s
Sixt
t3700-ad
d
:
f
ix dependence on std
o
ut
and stder
r
bufferi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Brandon Ca
s
e
y
git-rebase-
-
i
nteractive
.
sh: use printf instea
d
of echo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Na
t
han W
.
Pan
i
ke
Add a google
-
chro
m
e option for web--browse
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
u
n
i
o C Hamano
Merge bra
n
c
h
'ma
i
nt-1
.
7
.
1
'
into maint
commit
|
commitdiff
|
tree
2010-07-26
Junio
C
Ha
m
ano
Mer
g
e branch 'ma
i
nt-
1
.
7
.
0' into maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
J
un
i
o C Hamano
Me
r
g
e branch 'maint-1
.
6
.
6' into maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Ju
n
io
C
Haman
o
Merge b
r
anch 'maint-1
.
6
.
5
' into
maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
S
tephen Boyd
request-pull
.
txt:
Document -p option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
u
nio C Ha
m
ano
Merge branch
'maint-1
.
6
.
4' into ma
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Brockman
C
he
c
k s
i
ze of path buffer
before writing i
n
to i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Hamano
Git 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C
Hamano
tests
:
correct "does
r
e
f
log e
x
ist?" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t/: work around one-shot variable assignme
n
t
with
test_mu
s
t_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nie
d
er
t/R
E
ADME
:
correct an exception whe
n
b
r
e
aking a && chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Bra
n
don Casey
t/{t5541,lib-httpd
}
: r
e
place problema
t
ic '!()'
notati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
B
r
a
n
don
C
a
s
ey
t/t3700: convert two us
e
s of negation operato
r
'!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
J
unio C Hamano
Mer
g
e bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/README
:
clarify test_must
_
fail descrip
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Gr
e
g Br
o
ck
m
an
Check size
o
f p
a
t
h
buffer before writing into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio
C
H
amano
Mer
g
e br
a
nc
h
'maint
'
commit
|
commitdiff
|
tree
2010-07-19
Ralf
Thielow
up
d
ate-server
-
info: Shorten
read_p
a
ck
_
info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar A
r
n
f
j
ö
rð Bj
a
rmason
git ad
d
:
Add --ignore-missi
n
g
t
o
S
YNOPSI
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
var Arn
f
jörð Bjarmason
git submod
u
le add
:
Remo
v
e old doc
s
ab
o
ut implicit
-f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Leh
m
ann
git submodule add: Require the new --force option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jun
i
o C
H
amano
Merge bran
c
h
'
jl/add-n-ignore-m
i
ss
i
ng'
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Documentati
o
n: Expl
a
in git-mergetool's use o
f
temporar
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
u
nio C Hamano
Merg
e
b
ra
n
ch 'jc/d
i
ff-merge-base-mu
l
ti'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Ra
s
t
Only run aggreg
a
te-results over act
u
a
l
cou
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
o
na
t
han
Niede
r
Ad
d
a sample user
f
or the svndum
p
library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
d
i
f
f
A
.
.
.
B
:
do not limit
t
he
syntax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
M
erge
branch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
Merge branch '
w
p/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Me
r
ge bra
n
ch 'js/merge-
r
r-f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
io C H
a
man
o
Me
r
ge branch 'jc
/
diff-me
r
ge-base-mu
l
ti'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hama
n
o
Merge branch 'n
s
/merge-recursive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge bran
c
h 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge
b
ranch 'eb/doc-lo
g
-manpage'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o C Hamano
Merg
e
branch 'jn/gr
e
p-open
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Me
r
ge branch 'mg/revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
a
no
Merge b
r
anch
'j
k
/maint-status-keep-i
n
dex
-
time
s
t
amp'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Mer
g
e branch 'jc/rebase-i-commit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Haman
o
M
e
r
ge branch
'ab/
s
ubmodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'bc/mai
n
t-makefile
-
fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Docume
n
tation
:
a
d
d submod
u
le
.
* t
o
th
e
big configurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next