repo.or.cz
/
git
/
mjg.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
Mi
k
los Vajna
cherry-pick/revert:
m
ak
e
d
i
r
e
ct inter
n
al
c
all to merge_
t
ree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajn
a
builti
n
-mer
g
e
:
avoid run_command_
v
_opt
(
) for
r
ecursiv
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
merg
e
-r
e
cursiv
e
: introduc
e
merge_options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Stepha
n
Beyer
merg
e
-rec
u
rsi
v
e
.
c: Add more gener
i
c mer
g
e_r
e
cursi
v
e
_gene
r
ic()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
Sp
l
it out merge_recursive() to
merg
e
-recursive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C Hamano
Merge branch
'maint
'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
gitat
t
ributes: -crlf is not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
a
m
a
no
git-ap
p
ly: Loosen "match_beginn
i
ng" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io
C
H
a
mano
F
i
x
example
i
n
git-name-rev docum
e
ntation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Hamano
Mer
g
e
b
ran
c
h 'sp/
m
is
s
ing-thin-
b
a
se'
i
n
t
o maint
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Hamano
Merge bra
n
c
h
'sb/daemon'
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
Hamano
Merge br
a
nch 'af
/
maint-install-no-handlink' into
m
a
i
nt
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Hamano
shell: do n
o
t
pla
y
duplicated
d
e
f
i
nit
i
on games t
o
shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Alex Ries
e
n
F
ix use of
h
ardli
n
ks i
n
"m
a
ke install"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hama
n
o
Merg
e
branch 'np
/
ve
r
i
f
y-pack'
into maint
commit
|
commitdiff
|
tree
2008-08-29
Junio
C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor A
r
vid Lund
gi
t
-p4: Fix che
c
k
o
u
t
bug when usin
g
-
-import-loc
a
l
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
P
a
olo C
i
a
r
rocchi
tu
t
orial
:
gentler i
l
lustration of Alice/Bob workfl
o
w
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
prett
y
=f
o
rmat: res
p
ect date format opti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
P
aolo Bonzini
make git-shell paranoid
about
clos
e
d
s
tdin/std
o
ut/stderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yann Dirson
Document gi
t
k --argscmd flag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Linus Torvalds
Fix '--dirstat' with cro
s
s-directory renami
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Björn Steinbrink
f
o
r-each-ref: Allow a
t
railing slas
h
i
n
the
p
atterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex
R
iesen
l
ist_co
m
mands: o
n
l
y
call gi
t
_exec_pat
h
if
it is needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Ri
e
sen
Allow git
h
elp work w
i
t
h
out PATH set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
lex Riesen
Make main_cmd
s
and other_c
m
ds loca
l
to builtin-help
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remove
useless memset
o
f s
t
atic command n
a
me lists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remov
e
cal
c
u
l
ation of th
e
longest co
m
mand nam
e
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Bra
n
don Cas
e
y
dir
.
c: Avoi
d
c99
a
r
r
ay i
n
itialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
M
atthias Kestenholz
bash-completion: Add a
l
l s
u
b
module subcomman
d
s to
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
J
u
nio C
H
amano
Merge br
a
nch 'mv
/
merge-c
u
s
t
om'
commit
|
commitdiff
|
tree
2008-08-28
Junio C
H
amano
Mer
g
e
b
ranch 'ml/submodule'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
amano
Merge branch 'am/cherry-pick-rerere'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Hamano
M
e
rge bran
c
h
'jc/add-ad
d
re
m
o
ve'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
ano
Merge branch 'np/ver
i
f
y
-pack'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o
C
H
amano
Merge b
r
anch '
d
a
/
s
u
bmodule-sync'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C H
a
mano
Merge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
ano
ctype
.
c
: pr
o
tect
tiny C preproc
e
s
s
or constants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Linus
Torv
a
lds
in
d
ex-pack:
be
c
areful after fixing
up the
h
e
a
d
er/
f
oote
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Simon Hausmann
Make
i
t
p
o
ssib
l
e to abort the submi
s
sion
of
a
cha
n
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio
C Ham
a
no
Mer
g
e branch
'
a
f
/mai
n
t-install-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
ma
n
o
Merge bran
c
h
'
j
c/no
-
slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
ano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Jeff King
f
o
rmat-patch: use de
f
a
u
lt diff format even
with patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Nguyễn Thái Ng
ọ
c Duy
in
d
ex-pac
k
: setup git repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay
Jones
Suppres
s
s
o
me bash redirecti
o
n error m
e
ssages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay
Jones
Fix a warning (on
c
ygwin) to allo
w
-
W
er
r
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
A
ndreas
Färbe
r
Makefile: alway
s
pr
o
vide
a fallback
w
hen hardli
n
ks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Ham
a
no
daemo
n
.
c: minor style fixu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-subm
o
dule: add "sy
n
c" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
Revert
"
B
uild-i
n
"g
i
t-shell""
commit
|
commitdiff
|
tree
2008-08-25
Je
f
f King
Fix "git log
-
i --gr
e
p"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Tommi Virtanen
I
n
stall g
i
t
-shell
in bi
n
dir, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Hamano
Merge
branch 'jc/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Ham
a
no
Merge branch 'maint' to sync with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Ham
a
no
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C H
a
mano
Merge branc
h
'ag/
m
aint
-
combine-diff-fix
'
into maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Me
r
ge b
r
anch 'mv/maint-merge-f
i
x'
into maint
commit
|
commitdiff
|
tree
2008-08-24
Mark
L
evedahl
g
i
t-su
b
m
odule - Us
e
"get_default_re
m
o
te" fr
o
m git-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
onathan N
i
eder
Documentation: clari
f
y page
r
c
onfig
u
ra
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jona
t
han N
i
e
der
Documentat
i
on: clarify pa
g
er
.
<cmd> c
o
nfiguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Simon Hausm
a
nn
Clea
n
up the git-p4
d
ocumentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gav
r
ilov
Re
s
pect core
.
au
t
o
crlf
in comb
i
ned diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
M
iklos Va
j
na
Mak
e
fi
l
e: enable SNPRINTF_RETURNS_BOGUS for HP-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ha
m
ano
t7
6
06: fix custom merge test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hamano
Merge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Ham
a
no
merg
e
: fix numer
u
s bug
s
around "trivial merge" a
r
ea
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ham
a
no
unpack_trees(): p
r
otect
t
h
e
handcraft
e
d in-core index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Tor Arvid Lund
git-p4:
F
ix one-line
r
in p4_write_pi
p
e f
u
n
c
tion
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
David
A
gui
l
ar
g
i
t-s
u
b
m
o
du
l
e:
rep
l
ace duplic
a
ted code wit
h
a
m
o
d
ule
_
list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
N
i
colas Pi
t
re
discard
r
evindex data when pack list
changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan
H
ensgen
g
it-merge doc
u
mentation: more details about resolving
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Alex Riese
n
Extend "c
h
e
ck
o
ut -
-
track" DWIM to support more ca
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jona
t
han del
S
tro
t
her
Revert "Con
v
ert
ou
t
put messages i
n
m
e
r
ge-r
e
c
ursiv
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Er
i
c R
a
ible
Co
m
pletion
:
add missing
'=' for 'diff --diff-filter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Ha
m
ano
temp
l
ates/Makefile: install is unnecessary
,
just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
B
r
andon Casey
remot
e
.
c: add a function for del
e
ti
n
g a refspec array
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes
S
i
x
t
filter-b
r
anch: Grok
s
pecia
l
characters in t
a
g names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Schindel
i
n
te
s
t-lib:
d
o not remove
tra
s
h_directory
i
f
called with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
P
aolo Bonzini
prov
i
de mor
e
errors for the "merge into empty hea
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Shawn
O
.
Pearc
e
M
a
ke reflo
g
query
'
@{1219188
2
91
}
' act as '@{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil Robe
r
ts
config
.
mak
.
in:
Pass on LDFLAGS from configure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mark
Le
v
eda
h
l
git-submodule
.
sh -
Remove trailing / from
URL
if found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mik
l
os Vajna
Fix 'git
h
elp help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
compat/snprint
f
.
c: handl
e
snpr
i
n
tf's that a
l
ways return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herland
T
eac
h
"gi
t
d
iff -p" HTML fu
n
cname
patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kirill Smelkov
Teach "git diff -p" Python funcnam
e
pat
t
erns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
E
r
ic Wong
g
i
t-svn:
f
ix dcommit to urls
w
ith embed
d
ed usernames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Ha
m
ano
M
e
rg
e
br
a
nch 'ml/submodule-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
er
g
e b
r
anch
'
pm/log-ex
i
t
-
code'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
erge
b
ra
n
c
h 'sb/commi
t
-t
r
ee-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
Merge branch
'
pb/reflo
g
-dw
i
m
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
ama
n
o
Merge branc
h
'
j
c
/
add-stop-at-symlink'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e
b
ran
c
h 'kh/diff-tree'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Ham
a
no
Merge b
r
anch 'mg/
c
ount-o
b
ject
s
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merg
e
branch 'mz/push-
v
erbose'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'jc/index-extended-flags
'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
i
o
C Hamano
Merge branc
h
'cc/me
r
ge-base-
m
any'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Haman
o
Merge branch
'jc
/
test-deeper'
commit
|
commitdiff
|
tree
next