repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rerere: never renormalize
2010-08-06
Jonathan Niede
r
rerere: never renormalize
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Niede
r
r
e
rere: migrate to parse-options API
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Nieder
t4
2
00 (rerer
e
): mod
e
rnize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
onatha
n
Nieder
ll-merge
:
let cal
l
er decide whether to renor
m
al
i
ze
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
iede
r
l
l-merge: make flag easie
r
to populate
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan Nieder
Doc
u
me
n
tation
/
t
ec
h
n
ica
l
: do
c
ument
l
l_me
r
ge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
me
r
g
e
-
tr
e
e
s
:
l
et caller de
c
ide w
h
ether to
renorma
l
ize
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Nieder
me
r
ge-t
r
ees:
push
choice
t
o ren
o
r
m
alize away
from low
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
ieder
t603
8
(me
r
g
e
.
r
e
normali
z
e):
c
heck
that it can be turned
off
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
a
n Nieder
t
6038
(
merge
.
renormal
i
ze): try
chec
k
out -m and cherry
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonatha
n
Nie
d
er
t6038
(
m
erge
.
renorma
l
ize): styl
e
nitpicks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
git-svn: strip off leadi
n
g
s
lashes on --trunk argume
n
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan N
i
e
der
add-interactive: Clarif
y
“r
e
maining hunks in the f
i
le”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan
N
ied
e
r
Do
c
ume
n
tation/checko
u
t
:
c
larify
description
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
J
o
nathan Nieder
rebase -i -p:
d
o
cument
s
h
ortcomings
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan N
i
eder
DWIM '
g
it show -5' to
'
git
s
how --
d
o-walk -5'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
gitign
o
r
e
.
5: Clarify matching rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nied
e
r
rebase: improve
e
rror m
e
ssage
w
he
n
upstre
a
m argume
n
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
J
o
nathan Nieder
Documentation/checkout: cl
a
rify description
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
Jo
n
athan Nieder
fsck: fix bogus commi
t
hea
d
er check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
J
onathan Nieder
A
dd
g
it
r
emote
set-branches
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan N
i
eder
post
-
rec
e
ive-email: doc
u
ment command-line mo
d
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nieder
git
svn: avo
i
d uninitialized var
i
n
'
reset'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Mak
e
file
:
let header dependency
c
hec
k
er override COMPU
T
E_HEA
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than N
i
eder
M
akef
i
le: fix header dependency
c
hecker to allow NO_CURL
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/
n
ote
s
: ni
t
p
i
c
ks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
Documentatio
n
/notes:
clea
n
up des
c
ription of
rewr
i
ting
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
ath
a
n
Nieder
D
o
cumentation/notes: simplify treatm
e
nt of
d
efault
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Doc
u
mentation
/
l
og: add a
C
ONFIGUR
A
TION
section
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documen
t
a
t
i
on
/
note
s
: simplify treatment
of default
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Document
a
tion
/
notes: add
c
o
n
f
i
guration
s
ectio
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Niede
r
Do
c
u
m
entat
i
o
n
/
notes: de
s
c
ribe conten
t
o
f no
t
es
b
l
obs
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
t
han Ni
e
der
Docu
m
entation
/
n
o
tes: document format of
n
otes
t
re
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
J
onathan Nieder
cherry-pick: do no
t
d
u
mp
c
o
r
e
wh
e
n iconv fails
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jo
n
athan Nieder
pre
t
ty: initialize new
c
m
t_fmt_map to 0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan
N
i
e
der
a
dapt request-pull tests
f
or new
pull request
format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
Jo
n
athan
N
ieder
test-lib: some shell
s
do n
o
t let $? propag
a
te into
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan Nie
d
er
shortlog: Documen
t
and
t
est --format option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
t
h
an Nied
e
r
t4201 (sho
r
tlog): Test output form
a
t with mu
l
t
ipl
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t
4
201
(
shortlog)
:
guard setup with test_e
x
pect
_
success
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han Nieder
D
ocumentatio
n
/sho
r
t
l
o
g
:
scrip
t
ed use
r
s s
h
ould not rely
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Niede
r
commit
-
-amend:
c
op
e
with
m
issing
display n
a
me
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nie
d
e
r
test-lib: Let tests s
p
ecify c
o
mmands to
b
e r
u
n
at end
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jo
n
athan Nieder
fsck: chec
k
ident lines in
commit
o
bjects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nied
e
r
requ
e
st-p
u
ll: protect
against OPTIONS_KE
E
PDASHDAS
H
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan N
i
eder
t
e
sts for
r
equ
e
s
t-
p
ull
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
J
onath
a
n Nied
e
r
Documentatio
n
/Makefile: fi
x
inter
r
upt
e
d
builds of user
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonat
h
an Nieder
fix "bund
l
e
--
s
tdin" segfa
u
lt
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Niede
r
t5704 (
b
undl
e
): add
tests for bun
d
le --std
i
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nie
d
e
r
t
ag -v
:
use RUN_GIT
_
C
M
D to run ve
r
if
y
-tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan
Nieder
Do
c
ument new
"already-merged
"
r
ule for bran
c
h
-
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jona
t
ha
n
Nieder
Add
.
depend
d
irectories to
.
giti
g
nore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
t70
0
6: guard cleanup with test_ex
p
ect
_
success
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan Nieder
t5800: testgit helper requires Python support
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
J
onat
h
an
Nieder
t7400: cl
a
rify submodule update tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t
7
400: clari
f
y
's
u
bm
o
dule add' tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jona
t
han Nied
e
r
t74
0
0:
s
p
l
it setup into mul
t
iple tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nieder
T
e
a
c
h mailinfo %
<
as an
altern
a
t
i
ve sciss
o
rs mark
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jon
a
than Nied
e
r
M
akefile: future-proof Cygwin version check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
merge-rec
u
rsive: add a label fo
r
anc
e
s
tor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry-pick, revert: add a label f
o
r ances
t
o
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
revert: clarify label on
conflict hunks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
c
o
m
p
at: add mempcpy()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nat
h
an Nieder
checko
u
t -m -
-
conf
l
ict=diff3
:
a
dd
a label for
a
nces
t
or
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
merge_tre
e
s(
)
: add ances
t
or lab
e
l parameter
for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
merge_file
(
): add comm
e
nt e
x
plaining behavi
o
r wrt
c
o
nflict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout --confli
c
t
=
diff3: add
a
label for
a
n
cestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nie
d
er
l
l_me
r
g
e(): add
ancestor label paramet
e
r for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nie
d
er
me
r
ge-file --di
f
f3:
add a
labe
l
for ancest
o
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Ni
e
d
e
r
xdl_merge():
move file1 and file2 l
a
bels to xmpar
a
m
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_me
r
ge(
)
: ad
d
opti
o
n
a
l
ances
t
or labe
l
to di
f
f3-style
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
tests
:
document
c
herry-pi
c
k b
e
h
avior in fac
e
o
f
con
f
l
i
cts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
t
e
sts: docume
n
t fo
r
mat o
f
conflicts
fro
m
c
h
eckout -m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Niede
r
r
eve
r
t
: fix ti
n
y memor
y
leak in cherry-
p
ick --ff
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
ede
r
Makefile: Fix occasional
GIT-CFLAGS breakage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jona
t
han Nieder
Make
f
ile: Fi
x
CDPAT
H
pr
o
blem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonat
h
an Nieder
g
i
tk: Don't
clobber
"Reme
m
b
e
r this view" setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Ni
e
der
gitk: Add co
m
me
n
ts
to explain encode_view_opts and
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan Nieder
M
a
k
e
f
il
e
: clarify
def
i
nitio
n
of TEST_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan N
i
e
der
am:
remove r
e
base-apply d
i
rect
o
ry befor
e
gc
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jon
a
than
Nieder
t
ests: Fix
r
a
ce
condition in t700
6
-pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan Ni
e
der
t7
0
06-pager: if stdout is n
o
t
a
terminal, make a
new one
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
J
o
nat
h
an Nieder
tests: Add tests for a
u
tomatic use
of page
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Ni
e
der
am: Fix launching of
page
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nie
d
er
git
svn:
Fi
x
launching of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
onathan Nieder
git
.
1: Clarif
y
the
behavior of the --paginate option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan N
i
e
d
er
Ma
k
e 'git var
GIT_PAGER'
a
lwa
y
s p
r
int the configured
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jon
a
than Nieder
Fix 'git var' usage synopsis
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan N
i
eder
Ma
k
efile: always remove
.
depend d
i
rectories on 'make
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonatha
n
Ni
e
d
er
Mak
e
file
:
tuc
k
away generated m
a
kef
i
le fragm
e
n
ts in
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jona
t
h
a
n Nieder
Do not install shell libraries
exe
c
u
t
able
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan Ni
e
der
Teach Ma
k
ef
i
le to check he
a
der depen
d
encie
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan
N
i
e
der
Makefile: list
s
tandalone
p
rogram object fi
l
es in
PR
O
GRAM_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: lazily compute header dependencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
N
ieder
Makefile: li
s
t generated ob
j
ect files
i
n
O
BJECT
S
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
N
ieder
M
a
kefile: disabl
e
default
impli
c
it rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Ni
e
der
Makefile: rearrange dependency rule
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefi
l
e: transport
.
o
d
epends on branch
.
h now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
on
a
t
h
a
n
Nieder
Me
r
ge branch 'master' of git://repo
.
or
.
cz
/
alt-git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
J
o
n
a
than Nieder
Mak
e
file: drop depende
n
cy on $(wildcar
d
*
/*
.
h
)
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next