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 Her
l
and
gi
t
notes m
e
rge: Add another auto-resol
v
i
n
g
s
trategy
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
git notes merge: --c
o
mmit sho
u
ld fail if underlying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes
merge: List conflictin
g
notes
i
n notes merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
la
n
d
git n
o
tes mer
g
e
: Manual confl
i
ct r
e
sol
u
tio
n
, part 2
/
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
an
d
git notes me
r
ge: Ma
n
u
al confli
c
t resolution, part 1/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erland
Documentat
i
on
:
Prelimina
r
y d
o
cs on 'git note
s
merge'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
git notes merge: Add automatic
conflict resolvers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git note
s
merge: Handle real,
n
on-conflicting not
e
s
.
.
.
-
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 He
r
lan
d
bu
i
l
t
i
n/
n
otes
.
c: Refacto
r
crea
t
ion of notes commits
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s merge: Initial
i
m
plement
a
tion handling tri
v
i
a
l
.
.
.
-
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
Joh
a
n
H
erland
builtin/notes
.
c: Sp
l
it
notes ref DWIMmery int
o
a sepa
r
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
o
tes
.
c: Use two newlines (ins
t
ea
d
of one
)
when concate
n
atin
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivi
a
l)
t
3303: Ind
e
nt with
t
abs
i
nstead of spaces
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
no
t
es
.
h/c: Prop
a
gate
c
o
mbi
n
e_no
t
es_fn
r
eturn value
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
h/c:
A
l
l
ow combine_note
s
f
unctions t
o
remove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
la
n
d
notes
.
c: Reorder
f
unctions in p
r
eparation for
n
ext
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
h: Make default_note
s
_ref()
a
v
ailable in notes A
P
I
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) notes
.
h: Minor do
c
umentation fixes
t
o c
o
py_n
o
tes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
n
o
tes
.
c: Hexify SHA1 in die() messa
g
e from ini
t
_notes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
René Scharfe
notes: allow --dry-ru
n
f
or -n and --verbose for -v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Mat
t
hieu Moy
D
ocument -B<n
>
[/<m>]
,
-M<
n
> and -
C
<n> vari
a
nts 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
Docume
n
tation: cit
e
g
i
t-am from
g
i
t-appl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Thomas Rast
t7003:
fix subdirectory-filter test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
at
h
an Nieder
Allow
"check-ref-for
m
at --branch" from
s
ubdirectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan Nieder
c
heck-ref-format: handle subcommands i
n
sep
a
rat
e
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-05
Matthieu
Moy
p
r
e
t
t
y-option
s
.
txt: match --fo
r
mat's documentati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Junio
C Hamano
Merge branch
'
sv/maint-d
i
f
f
-q-
c
lear-fix
'
into maint
commit
|
commitdiff
|
tree
2010-08-03
Junio C
Ham
a
no
M
e
rge branch 'rr/svn-fe'
into maint
commit
|
commitdiff
|
tree
2010-08-03
Junio C
Ham
a
no
Merge branch 'pt/git-gui' into m
a
int
commit
|
commitdiff
|
tree
2010-08-03
R
amk
u
mar Ramachandra
cont
r
ib/svn-fe: Add the s
v
n-fe targ
e
t
to
.
gi
t
ignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Ramkumar
Ramachandra
con
t
rib/svn-fe: Fix
I
ncludePath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Ha
m
ano
Me
r
ge bran
c
h
'ab/tap' into maint
commit
|
commitdiff
|
tree
2010-08-02
Ævar A
r
nfjörð Bjarmaso
n
t
e
s
t-lib: Remove 3 year old no-op
-
-no-python op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Ævar
Arnfjörð Bjarmas
o
n
test-lib
:
I
g
n
o
re --quiet
u
nder a TAP harne
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Junio C
H
aman
o
Merge git://re
p
o
.
or
.
cz/git-g
u
i into pt/git-
g
ui
commit
|
commitdiff
|
tree
2010-08-02
Thom
a
s Rast
Documentatio
n
/rev-p
a
rs
e
: quoting i
s
requ
i
red
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
u
nio C
H
amano
D
o
cum
e
ntati
o
n:
reporting bug
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Fix DIFF_QUEUE_CLEAR refact
o
ring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
Da
v
id
D
.
Ki
l
zer
F
ix
g
it rebase --c
o
nti
n
ue
t
o work w
i
t
h
touched
files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
M
atthie
u
Moy
Do
c
ument ls-files -t as semi-ob
s
o
l
et
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Ju
n
io C Haman
o
Git 1
.
7
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Ju
n
io
C H
a
mano
Sync with 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Ju
n
io 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
Jun
i
o C
Hamano
Gi
t
1
.
7
.
0
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
J
ona
t
han N
i
eder
c
o
nfig
--get --path: chec
k
for unset $H
O
M
E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
S
t
ephen
B
oyd
commit: remove fu
l
l
stop from usa
g
e
h
elp for -u
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Matthieu Moy
C
l
a
r
ify help
message
when no remote is specified
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Ras
t
Make
f
ile: add check
-
docs excep
t
i
on for gitrevis
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
T
h
omas Rast
Fix 'git' wrapper usage string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
T
ho
m
as
R
a
s
t
Documentation/git-push: Explain
status outpu
t
i
n mo
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Document receive
.
denyDe
l
eteCurrent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Tho
m
as
R
ast
Ca
s
t execl*() NULL
se
n
tinels to (c
h
a
r *)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Nguyễn T
h
ái Ngọc Duy
git-
r
ead-
t
re
e
.
txt: a
c
knowledge t
h
e
d
ir
e
ctor
y
match
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Jon
Sey
m
o
u
r
IN
S
TALL: configure /e
t
c/xml/cat
a
log
t
o build doc
s
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
J
ohannes Sixt
t37
0
0-add: fix dependenc
e
on stdout and stde
r
r b
u
ffering
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Brandon
Casey
git-re
b
a
s
e
-
-
inte
r
active
.
sh:
u
s
e printf
i
nste
a
d of echo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Nath
a
n
W
.
P
anike
Add a google
-
chr
o
me option for web--b
r
owse
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Junio
C
H
amano
Merge branch 'maint-1
.
7
.
1' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-07-26
Jun
i
o C Hamano
Merge branch 'maint-1
.
7
.
0
'
into maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merge branch
'
maint-1
.
6
.
6' into maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio C
H
a
mano
Mer
g
e branch 'maint-
1
.
6
.
5' into m
a
int-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen Boyd
reques
t
-pul
l
.
txt: Docu
m
e
nt -p
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Junio C Ham
a
no
M
e
r
g
e branc
h
'maint-1
.
6
.
4
' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Brock
m
a
n
Check
s
ize of path buffer be
f
ore w
r
iting
i
n
t
o it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Haman
o
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ham
a
no
tests: corre
c
t "does r
e
fl
o
g exist?"
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon C
a
sey
t/: work aroun
d
one-shot vari
a
bl
e
assignment with test_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/README: correct a
n
exception
w
hen
b
reaking a &
&
chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Br
a
n
do
n
Casey
t/{t55
4
1,li
b
-httpd}: repla
c
e probl
e
matic '!()' not
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Bran
d
o
n Casey
t/t3700: c
o
nvert two uses of negation operator
'!
'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
J
u
nio C
H
a
mano
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2010-07-20
B
r
a
ndon Casey
t/REA
D
ME:
c
larify test
_
mu
s
t_fail d
e
scription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
G
r
e
g
Brockma
n
Check
s
ize of path
b
uffer befo
r
e writi
n
g i
n
to it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
u
nio C
H
a
mano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf
T
hi
e
l
o
w
update-server-info: Shorten re
a
d
_
pac
k
_info_fi
l
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmaso
n
git
add
:
Add
-
-ignor
e
-miss
i
ng t
o
SYN
O
P
S
IS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmason
git submod
u
le add: Re
m
ove ol
d
docs about i
m
p
lic
i
t -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens
Lehm
a
nn
git submodule add
:
Requ
i
re the new --force option to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio
C Hamano
Merg
e
branch 'jl/add-n-ignore-missi
n
g'
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Docume
n
tatio
n
: E
x
p
lain git-mergetool's use of tem
p
or
a
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jun
i
o
C
Hamano
M
e
rge bra
n
ch
'jc/diff-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-16
T
homas Rast
Only ru
n
aggre
g
ate-results
o
ver act
u
al
c
ounts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Ni
e
der
Add a sample user
for the
sv
n
dump librar
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
uni
o
C Hamano
d
i
f
f
A
.
.
.
B: d
o
not limit the
s
y
n
tax to
o
n
a
rr
o
wly
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Mer
g
e
bra
n
c
h
'jn/paginat
e
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C H
a
mano
Merge branch 'wp/merge-tree-fix
'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Mer
g
e branch 'js/merge-rr
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io
C Hamano
Merge b
r
anch 'jc/d
i
ff-merge-bas
e
-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge br
a
nc
h
'ns/merge-recursive-upt
o
date'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C
H
a
mano
Merge b
r
anch
'
j
n
/tests'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Merge branch
'eb/doc-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
br
a
nch
'
jn/gre
p
-op
e
n'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Ha
m
ano
Merge branch 'mg
/
revision-do
c
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merge br
a
nch 'jk/maint-stat
u
s-keep-i
n
dex-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jc/reb
a
se-i-
c
ommit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
M
e
rge branch 'ab/submodu
l
e-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'bc/maint-m
a
kefi
l
e
-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
Merge branch
'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Doc
u
mentatio
n
: ad
d
s
u
bmodule
.
* to
t
he big configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next