repo.or.cz
/
git
/
dkf.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 automatic conflict resolvers (ours, theirs, union)
2010-11-17
Johan Herland
gi
t
note
s
merge: Ad
d
a
u
tomati
c
c
o
nf
l
ict resolvers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
gi
t
no
t
es mer
g
e
:
Ha
n
dle real, non-conflicting notes
.
.
.
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 Herlan
d
builtin/notes
.
c
:
Refac
t
or creation of notes commi
t
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
no
t
es m
e
rge: Initial
i
mple
m
entati
o
n han
d
lin
g
t
r
iv
i
a
l
.
.
.
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
builtin/notes
.
c
:
Split
n
otes ref DWIMme
r
y
i
n
to
a separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rlan
d
notes
.
c: Use two newlines
(in
s
tead of o
n
e) when conc
a
tenatin
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(
t
rivial) t330
3
: Indent
with
tabs instead
of spaces
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
notes
.
h/c:
Propagate combine_n
o
tes_fn ret
u
rn v
a
lue
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
ote
s
.
h/c: Allow
c
om
b
ine_not
e
s fu
n
ctions
to
r
emove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
n
o
t
es
.
c: Reord
e
r functions in preparat
i
on
fo
r
next
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
e
r
land
notes
.
h: Make
d
efault_n
o
te
s
_ref
(
)
a
vailable
i
n notes API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n Herlan
d
(trivial) notes
.
h
: Minor d
o
c
u
me
n
tation fixes to cop
y
_
n
ote
s
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an
Herlan
d
no
t
es
.
c:
H
exify SHA1
i
n die() message fro
m
ini
t
_n
o
t
e
s()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René Scha
r
f
e
notes
:
allow --dry-run
for
-n and
-
-verbose for -v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
M
atthieu Moy
Doc
u
ment -B<n
>
[/<m>
]
,
-M<n> and -C<n> variants
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Brad King
Do
c
um
e
n
t
a
tion: cite git-am from git-a
p
ply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Thomas Rast
t7
0
03: fix subdirectory-filter test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
than Nieder
A
l
low "check-
r
ef-
f
ormat --branc
h
" from subdirectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
than N
i
e
d
er
check-ref-f
o
rmat: handle subcomma
n
ds in sepa
r
ate functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
Ma
t
thie
u
Moy
pr
e
tt
y
-op
t
ions
.
txt
:
match
-
-format's d
o
cumentation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Me
r
ge branc
h
'sv/maint-diff-q-c
l
ear-fix' i
n
to
m
aint
commit
|
commitdiff
|
tree
2010-08-03
J
u
ni
o
C
Hamano
Merge bra
n
ch
'
r
r/svn-fe' into maint
commit
|
commitdiff
|
tree
2010-08-03
Jun
i
o C Hamano
M
erge b
r
anch '
p
t/git-gui' into
maint
commit
|
commitdiff
|
tree
2010-08-03
Ra
m
kumar
Ramachandra
con
t
rib
/
svn
-
fe: Add the svn
-
fe
t
a
rg
e
t to
.
gi
t
ignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
R
a
mkumar Ramachandra
contr
i
b/
s
vn-fe: Fi
x
IncludePath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Juni
o
C
H
amano
Mer
g
e br
a
nch 'ab/tap' into mai
n
t
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjörð
Bjarmaso
n
t
e
st-lib: Remove 3 year old no
-
op --
n
o
-
python option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnf
j
örð
Bj
a
r
m
a
son
tes
t
-lib
:
Ignor
e
-
-quiet
und
e
r a TA
P
harness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Merge git://repo
.
or
.
cz/git-gui into pt/gi
t
-gui
commit
|
commitdiff
|
tree
2010-08-02
T
homas Rast
Docume
n
tation/re
v
-pa
r
se: quoting
is
r
equired
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Documentation:
repor
t
i
n
g bugs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio
C
Hamano
Fi
x
DIFF_QU
E
UE
_
CL
E
A
R
refactoring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
David D
.
Kilzer
Fix git rebase --continue to work with touched files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
M
atthieu Moy
Document ls-files
-
t as
s
emi-obsol
e
te
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio
C Hamano
Git 1
.
7
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
Sy
n
c with 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Junio 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
w
ith
1
.
7
.
0 series
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
Git 1
.
7
.
0
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan
N
ied
e
r
c
on
f
ig
-
-g
e
t --path:
check
for unse
t
$HO
M
E
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Steph
e
n Boyd
comm
i
t:
r
emo
v
e full stop
f
r
o
m usage help f
o
r -u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Matth
i
eu Mo
y
Clarify help mes
s
age wh
e
n no rem
o
te is sp
e
cified
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Tho
m
as Ras
t
M
ake
f
ile: add
chec
k
-docs exception f
o
r gitrevi
s
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Tho
m
as Ra
s
t
Fix 'git' wrapper usag
e
string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Tho
m
as
R
a
st
Documenta
t
i
on/git-push: Expla
i
n s
t
atus
o
u
t
put in more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas
R
a
st
D
ocu
m
ent rece
i
ve
.
denyDeleteC
u
r
r
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
T
h
o
m
a
s
Rast
Cast execl*() NULL sentinels to
(
char *)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
N
g
uyễn T
h
ái Ngọc Duy
git-read-tree
.
txt
:
acknowledge the di
r
ectory
m
atching
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jon Se
y
mour
INSTA
L
L:
c
onf
i
gure
/etc/x
m
l/catalog to b
u
ild d
o
cs on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Joh
a
n
n
es Sixt
t370
0
-
a
d
d
:
fix d
e
pende
n
ce o
n
stdo
u
t and std
e
r
r buffering
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Brandon Casey
git-
r
ebase
-
-in
t
e
r
a
c
t
ive
.
sh: use p
r
intf instead o
f
echo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nathan W
.
Panike
Add a
g
oo
g
le
-
chro
m
e optio
n
for web--brows
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merge branch 'm
a
int-1
.
7
.
1
' into
maint
commit
|
commitdiff
|
tree
2010-07-26
Ju
n
io
C
Ham
a
n
o
M
erge branch
'm
a
i
n
t
-1
.
7
.
0' into
maint
-
1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Junio
C Hamano
Merge branch
'
m
aint-1
.
6
.
6' into maint
-
1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Jun
i
o C Ham
a
no
Me
r
ge branch 'm
a
int-1
.
6
.
5' i
n
to maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen
Boyd
re
q
uest-pull
.
txt: Doc
u
ment -p option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
M
erge
b
ranch 'mai
n
t
-
1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Brock
m
an
Check
size o
f
path buffer before
w
riting into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C
H
am
a
no
Git
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
un
i
o
C
H
a
mano
tes
t
s
: correct "doe
s
reflog
e
xist?"
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Bran
d
on Casey
t
/: work around
one-shot
vari
a
ble assignmen
t
with tes
t
_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonath
a
n N
i
eder
t
/README: co
r
rect an exception when break
i
ng a && chai
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon C
a
sey
t/{t5541,lib-httpd}: repla
c
e pro
b
lematic '!()' notation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Br
a
ndon Ca
s
ey
t/
t
3700: conve
r
t
t
wo use
s
of negation op
e
rator '
!
'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
J
unio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-20
Bran
d
o
n Casey
t/README: clarify test_must_fail descr
i
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Gr
e
g Brockman
Check size of path buffer bef
o
re wr
i
ting in
t
o it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
io C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ral
f
Thiel
o
w
update-serve
r
-info: Shor
t
en r
e
a
d
_pack_info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar Arnfj
ö
rð Bja
r
mason
g
i
t add: Add --ignore
-
m
i
ssing to SYNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar Arnfjörð
B
j
armason
git s
u
bmodul
e
add
:
Remove old d
o
c
s
about
impli
c
i
t -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens
L
ehmann
git sub
m
odu
l
e add:
R
e
quire
t
he
new --force option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jun
i
o C Hamano
Merge
branch 'jl/add-n-ignore-missing
'
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Documentation:
E
x
plai
n
git-mergetoo
l
's use of t
e
m
p
o
r
ary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
Merge
branch 'jc/d
i
ff-me
r
ge-
b
ase-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thom
a
s Ra
s
t
Only run aggregate-results over actu
a
l
counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
onathan Nieder
Add a samp
l
e u
s
er for th
e
svndum
p
lib
r
ary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
d
i
ff A
.
.
.
B:
d
o no
t
l
im
i
t the s
y
ntax too narrow
l
y
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge bra
n
ch 'jn/paginat
e
-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Ham
a
no
Merge bran
c
h
'wp/merg
e
-t
r
ee-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
M
e
rge branch 'js/me
r
ge
-
rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o
C Hamano
Merge branch 'jc/diff-merg
e
-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C H
a
mano
M
er
g
e
bran
c
h 'ns/merge-re
c
ursiv
e
-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Ha
m
ano
Merge
b
ran
c
h 'j
n
/te
s
ts'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Merge branch 'eb/
d
o
c
-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge branch '
j
n
/gre
p
-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merg
e
b
r
anch 'mg/revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio
C
H
am
a
no
Merge branch 'jk/maint-status-keep-index-t
i
m
e
st
a
mp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
M
e
rg
e
b
r
anch 'jc/reba
s
e-i
-
commit-msg
-
f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
Merge br
a
nch 'ab/submodule-add-
f
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
a
no
Merg
e
branch
'
bc/mai
n
t-
m
a
k
efile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonatha
n
Nie
d
er
Do
c
um
e
ntati
o
n:
add s
u
bm
o
dule
.
*
to t
h
e big co
n
figuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitmod
u
l
es
.
5: u
r
l can
be a re
l
ative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pa
v
an
Kum
a
r Sunkara
gitweb: fi
x
esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Ni
e
der
git --pa
g
in
a
te: pa
g
i
n
ate ex
t
ernal commands ag
a
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soff
i
a
n
MERG
E
_
R
R i
s
in
.
git, not
.
git/rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will P
a
lmer
m
e
r
ge-tree: fix
wher
e
two br
a
nches share no c
h
ange
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Pa
l
mer
add basic
t
ests for merg
e
-
t
ree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next