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
Notes API: write_notes_tree(): Store the notes tree in the database
2010-01-19
Junio C
Hama
n
o
M
erge branch 'jc/rere
r
e'
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o
C Ha
m
ano
Merge
b
r
a
n
ch 'p
c
/
u
ninteresting-sub
m
odule-disap
p
e
a
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge bra
n
ch 'nd
/
include-termios-for-o
s
ol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branc
h
'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Grue
n
ba
c
her
builtin-apply
.
c: fi
x
t
h
e --- and +++ heade
r
filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
ani
e
l
Barkalow
Re
p
l
a
ce parse_blob() wi
t
h
a
n explanatory comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merge branch
'
j
m
/maint-1
.
6
.
5-grep-
N
UL-terminat
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meye
r
ing
grep:
NUL terminate input f
r
om a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Grue
n
bacher
builtin-
a
pply
.
c:
S
k
i
p
filenames
without e
n
ough componen
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
sym
l
inks
.
c
:
remov
e
un
u
sed functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Haman
o
object
.
c: rem
o
ve
u
nused functi
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
H
amano
Documen
t
that merge strategi
e
s
can now tak
e
their ow
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
very
Pe
n
na
r
un
E
xtend merge-subtree tes
t
s
t
o test -Xsu
b
t
r
e
e=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Make "subtre
e
"
part more
o
rthogon
a
l
to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull:
Fi
x
parsing of -X<op
t
i
o
n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery
Pennarun
Teach
git-pull to
pa
s
s
-
X<option> to
git-mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Penn
a
run
git
merge -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
U
pd
a
te draft
r
elease n
o
t
e
s to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
Merge
b
r
a
nch '
t
c/test-locate-htt
p
d'
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C
Hama
n
o
Merge branch 'jh/co
m
mit-status'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
Hamano
M
erge
b
ranc
h
'jn/
m
ak
e
file'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Merge branch 'jc/maint-1
.
6
.
1-checkout-m-custom-m
e
r
ge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/clone-v-p
r
ogress'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge br
a
nch
'
tc/s
m
art-http-rest
r
ict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Me
r
ge
b
ranch 'jk/run
-
c
o
m
m
and-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Merge
b
ranch 's
r
/
g
f
i-options
'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
H
am
a
no
Update COPYING
w
ith
G
PLv2 wi
t
h new FSF addre
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
user_ide
n
t_sufficiently_gi
v
e
n
(): refactor
t
he logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Hamano
u
s
er_ide
n
t
_
suff
i
ci
e
nt
l
y_given(
)
:
refactor t
h
e logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
mano
rerere: honor confl
i
ct-
m
arker-size att
r
i
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
r
e
re
r
e: prepare
for
cus
t
omizabl
e
con
f
li
c
t marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
commit
.
c::print_summary: do
n
ot relea
s
e the form
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C H
a
mano
conflict-marker-s
i
ze:
n
ew attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C H
a
mano
rerere: use ll_merge(
)
instea
d
o
f us
i
ng
xdl_m
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merg
e
-tree: use ll
_
merge()
not xdl_me
r
g
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
xdl_merge(): allow passin
g
down
marker_size in xmparam
_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C H
a
mano
xdl_merge(): introduce xmparam_t for mer
g
e speci
f
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_
a
ttr(
)
: fix function signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Joh
a
n
n
es Sixt
Do not use
d
at
e
.
c:tm_to
_
t
ime_t() f
r
om co
m
pa
t
/mingw
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
A
n
drzej K
.
Hacze
w
sk
i
MSVC: Windows-native im
p
lemen
t
ation for subset of Pthreads API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-17
Ramkumar Ra
m
achandra
Documentation: Update git cor
e
tutor
i
al clar
i
fying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ramsa
y
Jones
MSVC: Fix an "inc
o
mpa
t
ible pointe
r
ty
p
es"
c
ompiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johanne
s
Sixt
Window
s
:
a
void the "dup dance" when spawning a child
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johanne
s
S
ixt
Windo
w
s:
s
impli
f
y the pipe(2) impl
e
m
e
n
tation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
W
i
nd
o
ws
:
boost startup by avoiding a static depe
n
denc
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
E
ri
k
F
a
ye-Lund
Wi
n
d
ows:
d
isable P
y
thon
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
I
l
a
ri Liusvaara
Add push --set-upstream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
C
h
r
istian Couder
t71
1
1
:
fix
bad
H
EAD in tests wit
h
unmerged e
n
trie
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id Agui
l
ar
d
ifftool: Update copyright notices to
list each year
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Rich
a
r
d Weinberger
Fix uniniti
a
l
i
zed var
i
able i
n
g
e
t
_
refs_
v
i
a
_r
s
ync()
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Tarmigan Casebolt
Test t55
6
0: Fix
test
w
hen
r
un with
d
ash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Nguyễn Thái Ng
ọ
c Duy
statu
s
: only touch path we may need to chec
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
difftool: Us
e
eva
l
to expand
'--extcmd' expr
e
ssions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
i
d
Aguilar
difftoo
l
:
A
dd '-x' and
a
s an alias for '--extcmd'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
t78
0
0
-
difftool
.
sh: Simp
l
ify the --e
x
tcmd test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep --
n
o
-inde
x
: allow use of "git grep" outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Juni
o
C Ha
m
ano
grep: pre
p
a
r
e to
ru
n
outsi
d
e
o
f
a wor
k
t
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Ramkum
a
r Ra
m
achandra
Document
g
it-
b
l
a
m
e triple
-C
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Dmitry Potapov
fast-import: tag
m
ay poin
t
to any objec
t
type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff
K
i
n
g
commit: allow s
u
ppressi
o
n of i
m
p
l
icit identity advice
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff Kin
g
c
ommit:
show
interesting i
d
ent information in summ
a
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
strbuf: add strbuf_addbuf_percent
q
uote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff Ki
n
g
strbu
f
_expand: convert "%%" to "
%
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mic
h
ael
H
a
ggerty
rebas
e
-i: Retain use
r
-edit
e
d
co
m
mit messages
a
fter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggert
y
t3404: Set
u
p more of
the
test repo in the
"setu
p
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mi
c
hael
H
aggerty
reb
a
se -
i
:
For fixup commands withou
t
s
q
u
a
s
h
es
,
do
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Micha
e
l
H
a
ggerty
rebase -i: C
h
ange
f
unction make_squa
s
h_message in
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael Hagge
r
ty
r
eba
s
e -i: Ex
t
ract function do_w
i
th_author
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hagger
t
y
re
b
ase -i: Handle
the
author script
al
l
in one place
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hag
g
e
rty
rebase -
i
: Extract a functio
n
"com
m
it_mess
a
g
e
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael H
a
ggerty
rebase -i: Simplify
comm
i
t
coun
t
i
n
g for g
e
ne
r
ated comm
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mic
h
ael Haggerty
rebase -i: Improve c
o
ns
i
stency
o
f comm
i
t count in
g
enerat
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggert
y
t34
0
4: Te
s
t th
e
commit cou
n
t
in commit messages gen
e
r
ated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
i
chael Haggerty
r
ebase
-
i
: Introduce a co
n
sta
n
t AM
E
N
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael
Haggerty
rebase
-i: I
n
t
r
o
d
u
c
e a constant AUTHOR_SCRIPT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mi
c
h
a
el
H
a
ggerty
rebase -i: Do
c
um
e
n
t ho
w
tempor
a
r
y files are used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael Hagger
t
y
r
e
ba
s
e -i:
Use
symboli
c
consta
n
t $MS
G
consist
e
n
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hagge
r
ty
rebase
-
i: Use "test -n
"
instead of "test
!
-z"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
r
ebase -i
:
Inline expressi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael Haggerty
rebase
-
i
:
Remove dead code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
r
e
base -i
:
M
ake
t
h
e
c
o
ndit
i
on fo
r
a
n
"if" more t
r
ansparent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
Me
r
ge branch 'jc/checkout-m
e
rg
e
-
b
ase'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
a
mano
M
e
r
g
e br
a
n
c
h '
r
s/maint-archive-match
-
pat
h
spe
c
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
a
no
Me
r
ge branch 'il/vcs-
h
elper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strbuf_addbuf
(
):
allow pass
i
ng t
h
e
s
am
e
buf to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
Merge branch
'
c
c
/res
e
t
-
mor
e
'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Ha
m
an
o
Merge branch '
n
d/spar
s
e
'
commit
|
commitdiff
|
tree
2010-01-13
J
uni
o
C Hama
n
o
t7502: test
c
o
m
mit
.
s
t
atus,
-
-
s
t
a
tus and --no-statu
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
grep: rip out pes
s
i
miza
t
i
on to us
e
fi
x
match()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
grep:
r
ip out support for e
x
ternal g
r
e
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
James P
.
Howa
r
d
,
II
commit: support comm
i
t
.
status, --status
,
and --
n
o-
s
tatu
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hama
n
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-12
Matthieu Mo
y
lockfile: sh
o
w abso
l
u
t
e
filename in
u
nable_t
o
_lock
_
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Bart
T
rojanowski
hg
-
to-git: fix
COMMITTER typ
e
-o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Matthieu Moy
Be more user
-
f
riendly when refus
i
ng t
o
d
o some
t
h
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ilari Liusvaara
Impr
o
ve error mes
s
age
w
hen a
transport helper was not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Sha
w
n O
.
Pearce
remote-curl: Fix Accept header for
smart
H
T
TP connections
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
M
ichae
l
Haggerty
rebase-i:
Ignore comments
a
nd b
l
ank lines in pe
e
k_next_command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next