repo.or.cz
/
git
/
ljr.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
cherry-pick/revert: make direct internal call to merge_tree()
2008-09-03
Miklos Va
j
na
cherry
-
pick/revert: make d
i
rec
t
i
n
terna
l
c
a
l
l
to
merge_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajn
a
builtin
-
merge: av
o
id run_command_v
_
opt() for recurs
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vaj
n
a
mer
g
e
-recu
r
sive:
intro
d
uc
e
merge_
o
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Stephan Beyer
merge-recur
s
ive
.
c: Add
m
ore generic merg
e
_recursive_gen
e
ric()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
aj
n
a
Split out merge_recur
s
ive() to
m
erge
-
recursive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C
H
aman
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio
C
Hamano
g
i
t
a
tt
r
ibutes: -c
r
lf
is not b
i
nary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
amano
git-apply
:
Loos
e
n "match_b
e
ginning"
logi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
H
amano
Fix example
i
n git-n
a
m
e
-
re
v
documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hama
n
o
Merge branch 'sp
/
m
issing-t
h
in-base'
i
nto main
t
commit
|
commitdiff
|
tree
2008-08-30
Junio C
Hamano
M
erge
b
ranch 'sb
/
daemon
'
commit
|
commitdiff
|
tree
2008-08-30
Junio C H
a
m
a
n
o
Merge br
a
n
ch 'af/maint-in
s
tall-no-ha
n
dlink'
i
nto maint
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C
H
ama
n
o
shell: do not play du
p
l
i
cate
d
definition gam
e
s to shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Alex Riese
n
Fix use of
h
ardlinks in
"
make install"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Ha
m
ano
Merge branch 'np/
v
erify-pack' into main
t
commit
|
commitdiff
|
tree
2008-08-29
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor Arvid Lund
git-p4: Fix check
o
ut bug when
u
sing
--i
m
por
t
-local
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
P
a
olo Ciar
r
occhi
t
ut
o
rial: gentler
illustration of Alice/Bob workfl
o
w
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
pretty
=
format: respect date f
o
r
mat options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Bonzini
make
g
it-she
l
l
p
aranoid about closed
s
t
di
n
/stdout/stderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Y
a
nn Di
r
son
Document gitk
--argscmd
flag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
L
inus
Torva
l
ds
Fix '--dirstat' with
cross-directory renaming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Björn
S
t
einbri
n
k
for-ea
c
h-ref
:
A
llow a trailing slas
h
i
n the patte
r
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x Riesen
list_commands: on
l
y call gi
t
_exec_path if it is
n
eeded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riese
n
Allow git help work without P
A
TH set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riese
n
Mak
e
main
_
cmds and other_
c
mds
l
oca
l
to buil
t
in-he
l
p
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex
Ri
e
sen
Remove useless
memse
t
of s
t
atic command name lists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remove calculat
i
o
n
of the long
e
st c
o
m
mand
n
ame from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Brando
n
Casey
dir
.
c: Avoid c99 array initialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
M
a
t
thias Kes
t
enholz
b
ash-c
o
mpletion:
Add all submodule subcommands
to t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
Junio C Ham
a
no
Merge
branch 'm
v
/
m
erge-custom'
commit
|
commitdiff
|
tree
2008-08-28
J
u
nio C Hamano
Merge bran
c
h
'
ml/s
u
bmodule'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Hamano
Merg
e
br
a
nch 'am/cherry-p
i
ck-rerere'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'j
c
/
a
dd-addremove
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'np/v
e
rify
-
pack'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Hamano
Merge branc
h
'da/submodule-s
y
nc'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
ctype
.
c:
p
rot
e
ct tiny C preprocessor constants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Li
n
us Torvalds
index-pack
:
be careful
after fixing
u
p
t
h
e header/footer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
S
im
o
n
Haus
m
ann
M
a
ke it possible to abort th
e
s
u
bmiss
i
on
of a ch
a
n
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
amano
Merge
b
r
an
c
h 'af/maint-install-no-handlin
k
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
ano
Merge b
r
anch 'jc/no-sl
i
m-shell'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Ham
a
no
Mer
g
e
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2008-08-27
Jeff
King
format-pa
t
ch:
use defaul
t
dif
f
forma
t
even with pat
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Nguyễn
T
hái Ngọc Duy
inde
x
-pack: se
t
u
p
git repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
R
amsay Jones
Suppress some b
a
s
h r
e
direction error
m
ess
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jon
e
s
Fix a warning (on
cygw
i
n) to
allow
-Werro
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Andr
e
as F
ä
rber
Ma
k
efile:
a
lway
s
provide
a
fall
b
a
c
k when h
a
rdlinks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
J
u
nio C
Hamano
daemo
n
.
c: minor style
f
ixup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid A
g
uil
a
r
gi
t
-subm
o
d
ule: a
d
d "sy
n
c
" comm
a
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Ha
m
a
no
R
evert "Build-
i
n "
g
it-shel
l
""
commit
|
commitdiff
|
tree
2008-08-25
Jeff
K
ing
Fix "
g
it log -i --g
r
ep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
T
o
mmi Virta
n
e
n
Inst
a
ll gi
t
-shell in bindir, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ha
m
ano
M
e
rge bra
n
ch 'jc/no
-
s
l
im-sh
e
ll'
commit
|
commitdiff
|
tree
2008-08-24
Junio C H
a
mano
Merge b
r
a
nch 'mai
n
t
'
to sync
w
i
th
1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Hamano
GIT
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Hamano
Merge branch
'
ag/
m
aint-combine-diff-fix'
i
n
to maint
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Haman
o
M
e
r
g
e bra
n
ch 'mv/maint-merge
-
fix' in
t
o main
t
commit
|
commitdiff
|
tree
2008-08-24
Mark Leved
a
hl
git-s
u
bmo
d
ule - Us
e
"
g
et_d
e
fau
l
t_rem
o
te" from git-p
a
rse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonat
h
an Ni
e
der
Document
a
tion:
c
larif
y
pager conf
i
g
urat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonatha
n
Nieder
D
o
cume
n
tation: clarify pager
.
<cmd> conf
i
guration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Si
m
on Hausma
n
n
Cl
e
an up the git-p4 docume
n
tation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexande
r
Gavrilov
Respect core
.
auto
c
rlf in co
m
bined diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Mak
e
file
:
en
a
b
le SN
P
RINT
F
_RETURNS_BOGUS
f
or
HP-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Ham
a
no
t
7
606: fix cu
s
tom
m
erge test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io
C H
a
m
a
no
M
erg
e
branch
'maint'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
merge: fix num
e
r
u
s bugs around
"trivial merge"
a
rea
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Hamano
unp
a
ck_trees
(
): protect the handcrafted
in-core i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
T
o
r Arv
i
d Lund
git-p4: F
i
x one-liner in p
4
_write_pipe
f
unc
t
ion
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule:
r
e
pl
a
c
e dup
l
icated cod
e
with a module_l
i
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
N
i
co
l
as Pi
t
re
d
i
scard revindex data when pack list chang
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
D
an Hen
s
gen
git-mer
g
e documentation:
more details ab
o
ut resolving
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
A
lex Ries
e
n
Exte
n
d "checkout --tr
a
ck
"
DWIM to s
u
ppor
t
mo
r
e cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan
del Stro
t
her
Revert "C
o
nvert output
m
essages in merge-re
c
ursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric Raible
Completio
n
: a
d
d
missing
'
='
f
or
'
diff --di
f
f-
f
ilter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
u
n
i
o C Hamano
templat
e
s/Makefile: install is
u
n
necessary
,
just
u
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Brando
n
C
a
s
ey
remote
.
c
:
add a fu
n
ction fo
r
deleting a r
e
fspec a
r
ray
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Joha
n
nes
S
ixt
f
ilter-
b
r
anch: Grok special ch
a
racters in
t
ag names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johan
n
es Schindelin
test
-
li
b
:
do
n
o
t remove trash_direct
o
r
y i
f
ca
l
led
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonzin
i
provide more errors for the "merg
e
into em
p
ty h
e
ad
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Sh
a
wn O
.
P
earc
e
Make reflog
query '
@
{1219188291}' act as '@{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
N
e
il
R
o
be
r
ts
c
o
nfig
.
mak
.
in: Pass o
n
LDFLAGS from configure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
M
a
rk
Lev
e
da
h
l
git-su
b
module
.
s
h
- Re
m
ove
t
r
a
iling / from URL if fou
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mik
l
os Vajna
Fix 'git help help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Br
a
n
d
on Casey
compat/s
n
printf
.
c:
handle snpr
i
ntf's
that alwa
y
s return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
o
h
an Herland
Teach "gi
t
d
i
ff -p" HTML
func
n
ame pa
t
te
r
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Ki
r
il
l
Smelk
o
v
T
e
a
ch "
g
it d
i
ff
-
p
" Pyt
h
o
n func
n
ame patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Eric Wong
g
i
t-svn: fi
x
dcom
m
it to urls
w
ith embe
d
ded usernames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
branch 'ml/s
u
bmodule-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
H
amano
Merge branch 'pm/log-
e
xit-code'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Me
r
ge branch 'sb/
c
o
m
m
i
t-tree-mi
n
i
lea
k
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
ano
Merge branch 'pb/reflog-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Haman
o
Merge
branch 'jc/add-stop-at-s
y
mlink'
commit
|
commitdiff
|
tree
2008-08-21
J
u
ni
o
C H
a
mano
Merge branch 'kh/diff-tree'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Me
r
g
e branch '
m
g/coun
t
-objec
t
s'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e b
r
anch 'mz/
p
ush-verbos
e
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge bra
n
ch 'jc/index-ext
e
nded-flags'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C H
a
man
o
M
e
rge
branch
'cc/
m
erge-base-many'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hamano
Merg
e
bran
c
h
'
jc/test-
d
eeper'
commit
|
commitdiff
|
tree
next