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
merge-recursive: move the global obuf to struct merge_options
2008-09-05
Miklos Vajna
merg
e
-
recursive: move the
g
lobal obu
f
to st
r
uct m
e
rge_options
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
m
erge-recurs
i
ve: get rid of the index_only g
l
obal va
r
iable
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-recu
r
s
i
ve: move
c
all_depth to struct merge
_
o
p
tions
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os
Vajn
a
c
herry-pick/revert: make direct i
n
te
r
n
a
l
ca
l
l to merge_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
bui
l
tin
-
merge:
avoi
d
r
un_comm
a
nd_v_opt() for recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-recursive: introdu
c
e m
e
rge_
o
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
St
e
phan Beye
r
merg
e
-recurs
i
ve
.
c: A
d
d more generic mer
g
e
_
re
c
ursive_generic()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
ajna
Split out merge
_
recursive() to m
e
rg
e
-
recursive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
gitattributes: -crlf is not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C H
a
mano
git-app
l
y: Loosen "mat
c
h_b
e
ginning" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
Fix example in git-name-rev documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
uni
o
C Hamano
Merge
b
r
a
nch 'sp/mi
s
sing-thin-base' int
o
maint
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io C Hamano
M
e
r
ge bran
c
h 'sb/da
e
mon'
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C
Ha
m
a
n
o
Me
r
ge
branch 'af/
m
a
i
n
t-in
s
tall-no-ha
n
d
link' into ma
i
nt
commit
|
commitdiff
|
tree
2008-08-30
Junio
C Hamano
shell: do not p
l
a
y
duplicated definition games to shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Alex Riesen
F
i
x use of hardlinks in "make install"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o
C Hamano
M
e
rge
branch
'np
/
verify-pack' into maint
commit
|
commitdiff
|
tree
2008-08-29
J
u
nio C Hamano
Me
r
ge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2008-08-29
T
o
r Arvid Lu
n
d
gi
t
-p4: Fix
checko
u
t
bug w
h
en u
s
in
g
-
-
import
-
local
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Ciarr
o
cchi
tutorial: gentler
i
l
lustration of
A
lice/Bob wor
k
flow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
J
eff King
pretty=format: respect date format opt
i
on
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Pao
l
o Bonzi
n
i
make
g
it-shell paranoid about cl
o
sed stdin/stdout/stderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yann Dirson
Document
g
i
tk
--
a
r
gscmd f
l
ag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Linu
s
Torvalds
Fix
'
--dirst
a
t
'
with cross-di
r
ectory
re
n
aming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
B
j
örn S
t
einbri
n
k
f
o
r-each-ref: Allow a tra
i
ling slash
i
n the patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x Ries
e
n
l
ist_commands: only call git_e
x
ec_p
a
th
if it is needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Ale
x
Riesen
Allo
w
git help wor
k
without
P
ATH set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riese
n
Make main_cm
d
s an
d
other_cmds local to
builtin-help
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex
Riesen
Remove u
s
ele
s
s
m
e
mset of sta
t
ic command na
m
e lists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
lex Riesen
Remov
e
calcul
a
tion of
the longest command name from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Bra
n
don C
a
sey
dir
.
c: Avo
i
d c
9
9
ar
r
ay
i
niti
a
l
i
zation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Matthias Kestenholz
bash-
c
o
mp
l
etion:
Add all submodule
s
ubcommand
s
to
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
Juni
o
C Hamano
Merge br
a
nch 'mv/merge-custom'
commit
|
commitdiff
|
tree
2008-08-28
J
unio C Hamano
Merge bran
c
h
'ml
/
s
ubmodule'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C Hamano
Merge b
r
anch 'am/cherry-
p
i
ck-rere
r
e'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
a
n
o
Merge bran
c
h 'jc/add-addremove'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C H
a
mano
Merge
branch 'np/ve
r
ify-pa
c
k'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
Merge branch
'
da/
s
ubmodule-sy
n
c'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
i
o
C
Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
c
t
y
pe
.
c: protect ti
n
y C
p
r
e
p
roc
e
s
s
or c
o
ns
t
ants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Linus
Torvalds
index-pack: be car
e
ful af
t
er fixing up the h
e
a
de
r
/foote
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
S
i
mon Hausmann
Ma
k
e it
possible t
o
abort
t
h
e
sub
m
ission of a chang
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
amano
Merge branc
h
'
a
f
/ma
i
nt-in
s
t
all-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
J
u
n
i
o
C
H
aman
o
M
e
rge branch 'jc/n
o
-slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
Hama
n
o
Mer
g
e
b
ra
n
ch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2008-08-27
Jeff K
i
n
g
format-
p
atch: use default di
f
f 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
D
uy
index-pac
k
: setup git reposi
t
ory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
Suppr
e
ss
s
ome
bash redirect
i
on
error mess
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
Fix a
w
a
rning (on cygwin) to
allow
-Werro
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
And
r
eas Färbe
r
Makefile: always provide a fal
l
back
when hardlin
k
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
J
u
nio C
Hamano
daemon
.
c: minor
style fixup
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-submodule: a
d
d "sy
n
c" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
J
unio
C Hamano
R
evert "Bu
i
l
d
-in "
g
it-shell""
commit
|
commitdiff
|
tree
2008-08-25
Jef
f
King
Fix "gi
t
lo
g
-i -
-
grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
T
o
mm
i
Virtanen
Inst
a
ll
git
-
s
hell
in bind
i
r
,
t
o
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
amano
Merg
e
br
a
nch 'jc/no-slim
-
s
hell'
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
amano
Merge bra
n
ch
'maint' to sync w
i
th 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
J
un
i
o
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/
m
ai
n
t
-
combine-d
i
ff-fix'
int
o
m
a
in
t
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Ham
a
no
Merge bra
n
ch 'm
v
/maint
-
m
e
rge-fix' in
t
o maint
commit
|
commitdiff
|
tree
2008-08-24
Mark Leved
a
hl
g
i
t-
s
ubmodule - Use "get_default_
r
e
m
o
te" fro
m
git-
p
ar
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
o
nathan Nieder
D
ocume
n
tati
o
n: clarify
p
ager
c
on
f
ig
u
r
ati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Niede
r
Doc
u
mentation
:
c
l
a
ri
f
y pager
.
<cmd>
c
onfigurati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
S
i
mon
Haus
m
a
n
n
Clean up the git-p4 docum
e
ntation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gavr
i
l
o
v
Respect c
o
r
e
.
autocrlf i
n
combined
d
iff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Mi
k
los
V
ajna
Makefile: ena
b
le
S
NPRINTF_RETU
R
NS_BOGUS f
o
r HP-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Ha
m
a
no
t7606: fix custom merge test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Ha
m
ano
M
e
r
ge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
m
e
rge: fix nu
m
eru
s
bugs around "trivial merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
unpac
k
_trees():
p
rote
c
t the hand
c
rafted in-co
r
e
index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Tor Arvid Lu
n
d
g
it-p4:
F
ix one-liner
i
n p4_w
r
i
te_pipe func
t
ion
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
i
d Aguilar
g
i
t
-
submodule: replace
d
uplicated code wi
t
h
a
module_list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Ni
c
o
l
as Pitre
d
iscard revindex da
t
a when pack li
s
t
changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan
Hensge
n
g
it-merge documentation: more
d
etai
l
s
a
b
out resolvi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Al
e
x
Riesen
Extend "checkout
-
-tr
a
ck
"
D
W
IM to suppo
r
t more cas
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jon
a
than del Strother
Revert
"
Convert outpu
t
mes
s
ages in me
r
g
e-recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric Raible
Completion: add missing '=' for 'diff --diff-filter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio
C
Hamano
templates/Makefile: i
n
stall
is unnecessar
y
, just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Brandon
C
asey
remote
.
c: add a function for deleting a ref
s
p
e
c
array
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Joh
a
nnes Sixt
filter-branch: Grok spec
i
al
characters in ta
g
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johan
n
e
s
Schind
e
lin
t
e
st-lib: do not remove trash_direct
o
ry if
c
alled
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonzini
p
r
o
v
ide
m
ore
e
rrors
f
or the "merge into empty head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Shawn O
.
P
e
arce
Make refl
o
g
q
uery '@{1219188291}'
act as
'
@{
2
0
0
8
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil Roberts
config
.
mak
.
in: Pass on
L
DFLAGS from configur
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
M
a
rk Levedahl
git-s
u
b
modu
l
e
.
sh - Remove trail
i
ng
/
from URL if found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
Vajna
Fi
x
'
g
it help help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio
C
Ham
a
no
M
e
rge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-21
Brando
n
C
asey
compat/sn
p
rintf
.
c: handle sn
p
rintf
'
s t
h
at
a
lways ret
u
rn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herl
a
nd
Teach "gi
t
diff -p"
H
TML funcn
a
me patter
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kir
i
ll Smelk
o
v
Teach "git diff -p" Python fu
n
c
n
ame patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
E
r
ic Wong
git-svn
:
fix dcommi
t
t
o urls with embedded usernames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Ham
a
n
o
M
e
r
g
e branch 'ml/submodule-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'pm/log-exit-code'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merg
e
b
r
a
nch 's
b
/commit-
t
ree-minile
a
k'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C H
a
mano
Merge
b
ranch 'pb
/
ref
l
o
g-dwim'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Hamano
Merge branc
h
'
jc/add-st
o
p-at-symlink'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C
H
amano
Merge branch '
k
h/diff-tree'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Me
r
ge branch 'mg/
c
ount-
o
bjects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
a
no
Merge branch 'm
z
/push-verbose'
commit
|
commitdiff
|
tree
next