repo.or.cz
/
git
/
dscho.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
M
i
klos Va
j
na
cherry-pick/revert
:
make
dir
e
ct internal
c
all to
m
erge
_
t
ree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
na
builtin-merge:
a
void run_com
m
and_v_opt() for r
e
cu
r
sive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
m
erg
e
-recursi
v
e: intro
d
uce merge_op
t
i
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Stephan Beyer
merg
e
-rec
u
r
s
ive
.
c: Add more gen
e
ric mer
g
e_recursive_generic
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajn
a
Sp
l
it out merge_recursive() to merge-
r
ecursive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Hamano
M
e
rge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
g
ita
t
tr
i
b
u
tes: -crlf is
n
ot
b
inary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C
H
ama
n
o
git-
a
pply: Loosen "match_begin
n
ing" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Hamano
Fix example in git-na
m
e-rev docum
e
ntation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C H
a
mano
M
erge branch
'sp/mi
s
sing
-
th
i
n-base' into
m
aint
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merg
e
b
r
anch 'sb/daem
o
n'
commit
|
commitdiff
|
tree
2008-08-30
J
unio
C Hama
n
o
Merge b
r
anch
'
af/maint-install-no-han
d
link'
i
nto
m
aint
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io C
H
amano
shell
:
do not play du
p
l
i
cated definitio
n
ga
m
es to shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Alex R
i
esen
Fi
x
use of hardlinks in "
m
ake
i
nstall"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Me
r
g
e
branch
'
np/verify-pack' into
m
aint
commit
|
commitdiff
|
tree
2008-08-29
J
unio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor Arvid Lund
git-p4: Fix checkout b
u
g when using --im
p
ort-local
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Ciarr
o
cc
h
i
tutorial: gent
l
er
illustration o
f
Alice/
B
ob work
f
low
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff Ki
n
g
pretty=form
a
t: re
s
pect d
a
te format options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
P
ao
l
o Bonzini
make git-shel
l
paranoid about clos
e
d st
d
in/stdout/stderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yann Dirson
Docum
e
nt gitk --
a
rgscmd flag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Linus Torvald
s
Fix '-
-
dir
s
tat' with cross-directory renaming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Björn Steinbrink
f
o
r-
e
ach-ref: Allow a
tra
i
ling slas
h
in
t
he patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
le
x
Riesen
li
s
t_com
m
ands: only call git_exec_p
a
th
i
f it is needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex
R
iesen
A
l
l
o
w git help work wit
h
out PAT
H
s
et
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
l
ex Riesen
M
ake
m
ain_cmds and other_cmds local
t
o built
i
n-help
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x
R
i
ese
n
Remove
u
seless memset o
f
static com
m
a
n
d name
lis
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remove calculatio
n
o
f the lo
n
gest command name from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
B
rand
o
n Casey
dir
.
c: Avoid c99 array i
n
itia
l
ization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Matthias Kestenholz
bash-c
o
mpletion:
A
dd all submodule
subcomma
n
d
s
to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
Ju
n
io C Hamano
Merge branch 'mv/
m
e
r
ge-custom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C H
a
mano
Merge branch 'ml
/
s
u
bmodul
e
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
ano
Merge b
r
anch 'am/cherry-pick-rerer
e
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
mano
Merge branch 'jc
/
add-addremo
v
e'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
Hamano
Merge branch '
n
p/
v
eri
f
y-pack
'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C Hama
n
o
M
erge branch 'da/submodul
e
-
s
y
nc'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
ctype
.
c:
pr
o
tect tiny C preprocessor cons
t
ants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
L
i
n
us Torvalds
index-pack: be car
e
f
ul a
f
ter fixing
u
p the he
a
der/foot
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
S
i
mon Hau
s
mann
Make it possible
t
o
a
b
o
rt the s
u
bmission of a change
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
M
e
r
g
e
branch 'af/maint-install-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Haman
o
Merge branch 'jc/
n
o
-
sl
i
m-shell'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io
C
Hamano
Merge
bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-27
Jeff K
i
ng
format-patch: use def
a
ult diff
f
or
m
at eve
n
wit
h
patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ngu
y
ễn Thái Ngọc Duy
i
n
dex-pack: setup git
repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jon
e
s
Suppress som
e
bash redirection error mess
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay
Jones
Fix
a
warning (
o
n cygwin) t
o
allow -W
e
rror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
And
r
eas F
ä
r
b
e
r
M
a
kefile: alway
s
p
rovid
e
a
fa
l
lback when har
d
links
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
J
unio C Ham
a
n
o
dae
m
on
.
c: minor
s
tyle fi
x
u
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-s
u
bmod
u
le: add "sync" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hama
n
o
Reve
r
t "Bu
i
l
d-in "g
i
t
-
shell""
commit
|
commitdiff
|
tree
2008-08-25
Jeff King
Fix "
g
it l
o
g -i --grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Tommi Virt
a
n
e
n
I
n
stall git-shell in bindir, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hamano
M
e
rg
e
b
r
anch 'jc/no-slim-s
h
ell'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hama
n
o
Merge branch 'maint'
to sy
n
c with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
J
unio
C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch
'ag
/
maint
-
combine-d
i
ff-fi
x
' int
o
mai
n
t
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
H
amano
Mer
g
e
branch
'
mv/maint-
m
erge-fix' into m
a
int
commit
|
commitdiff
|
tree
2008-08-24
Mark
L
e
v
edahl
git-sub
m
o
d
u
l
e
-
Use "
g
e
t_default_rem
o
te" f
r
om git-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
Docum
e
n
tation:
c
larif
y
pag
e
r
configur
a
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nied
e
r
D
o
cumentati
o
n: cl
a
rify pager
.
<cm
d
> c
o
nfi
g
ur
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Simo
n
Hausmann
Clean up the
g
it-p
4
documentati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexander
G
avri
l
o
v
Respect core
.
autocrlf
i
n
combined
d
iff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Mikl
o
s
Vajna
Makefile: enable SNPRINTF_RETURNS_BOGUS f
o
r H
P
-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C Hama
n
o
t7
6
06: fix custo
m
merge test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
merge: fix numerus bugs around
"
trivia
l
merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hamano
u
n
pa
c
k_t
r
e
es():
p
rotect the handcra
f
t
ed in-core i
n
d
e
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
T
o
r Arvid Lund
git-p
4
: Fix on
e
-lin
e
r in p4_writ
e
_pipe function
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Davi
d
Agu
i
la
r
g
it-submod
u
le: replace d
u
plicate
d
co
d
e wit
h
a m
o
dule_list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Nicolas
P
itre
discard
re
v
index data whe
n
p
ack li
s
t chan
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan Hensg
e
n
git-merge document
a
tion: more
d
e
tails about resolv
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
A
lex
R
i
esen
Extend "checkout --track" D
W
IM to support more cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jon
a
t
ha
n
del Str
o
ther
R
e
v
ert "Conv
e
rt output m
e
ssages in merge-recu
r
siv
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric Raible
Compl
e
tion:
add mi
s
s
i
n
g '=' for 'dif
f
--diff-filter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Ju
n
io C
H
a
mano
t
e
mpla
t
e
s
/Makefile: install is unnecessary, jus
t
use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Bra
n
don Cas
e
y
remote
.
c: add a function for
d
eleting
a
refspec array
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes
S
ixt
f
ilter
-
b
r
anch:
G
rok special ch
a
racters i
n
tag
n
a
mes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Joha
n
nes Schi
n
delin
test-lib: do
n
o
t
r
e
m
ov
e
t
r
ash_directory
if called with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonzini
provide more errors for
t
he "merge i
n
to empty
head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Sha
w
n O
.
Pearce
Make refl
o
g
query '@{12191882
9
1}' act as '@{2
0
08
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil
R
o
b
erts
config
.
mak
.
i
n
: Pass on LDFLAGS
from configure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
M
a
rk
L
ev
e
dah
l
g
i
t
-
s
ubmodule
.
s
h
- Remove tr
a
iling / from
U
RL if f
o
u
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
M
iklos
V
ajna
F
i
x 'git help help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Hamano
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-21
B
r
a
n
d
on Cas
e
y
c
o
m
pat/snprintf
.
c: handle s
n
printf
'
s
that a
l
ways return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
o
han H
e
rl
a
n
d
Teach "git diff -
p
" HTM
L
funcname
p
a
t
terns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
K
ir
i
ll Sme
l
kov
T
each
"git di
f
f -p" P
y
thon
funcname patte
r
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Er
i
c W
o
n
g
git-s
v
n: fix dcommit to
urls wit
h
embedded usernames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
M
erge branch 'ml/sub
m
odule
-
f
o
r
each'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
m
a
no
Mer
g
e
branch 'pm/log-exit-cod
e
'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge branch 'sb/c
o
mmi
t
-tree-min
i
le
a
k'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ham
a
no
Me
r
ge br
a
n
ch 'p
b
/reflog-d
w
im'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch '
j
c/add-stop
-
at-s
y
mlink'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ham
a
no
Merge branch 'kh/
d
iff-tree'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C H
a
mano
M
erge b
r
anch 'mg/c
o
unt-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
man
o
M
e
rge bra
n
ch 'mz/push-verbo
s
e'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
erg
e
branch 'jc/index-e
x
tended-flags'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io
C
Ham
a
n
o
M
e
rge branc
h
'cc
/
merge
-
base-many'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
Mer
g
e
b
r
anch
'
jc/te
s
t-
d
eeper'
commit
|
commitdiff
|
tree
next