aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'maint'Shawn O. Pearce2008-10-10
|\
| * rebase -i: do not fail when there is no commit to cherry-pickJohannes Schindelin2008-10-10
| * test-lib: fix color reset in say_color()Miklos Vajna2008-10-10
* | Merge branch 'dm/svn-branch'Shawn O. Pearce2008-10-09
|\ \
| * | Add git-svn branch to allow branch creation in SVN repositoriesFlorian Ragwitz2008-10-06
* | | Merge branch 'jc/add-ita'Shawn O. Pearce2008-10-09
|\ \ \
| * | | git-add --intent-to-add (-N)Junio C Hamano2008-08-31
* | | | Merge branch 'mv/merge-refresh'Shawn O. Pearce2008-10-09
|\ \ \ \
| * | | | builtin-merge: refresh the index before calling a strategyMiklos Vajna2008-10-03
* | | | | Merge branch 'maint'Shawn O. Pearce2008-10-08
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | git init: --bare/--shared overrides system/global configDeskin Miller2008-10-08
| * | | git rm: refresh index before up-to-date checkJohannes Schindelin2008-10-08
* | | | Merge branch 'maint'Shawn O. Pearce2008-10-06
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Teach rebase -i to honor pre-rebase hookNanako Shiraishi2008-10-06
| * | fix bogus "diff --git" header from "diff --no-index"Linus Torvalds2008-10-06
* | | tests: add a testcase for "git submodule sync"David Aguilar2008-10-02
* | | Merge branch 'maint'Shawn O. Pearce2008-10-02
|\ \ \ | |/ /
| * | gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.shJakub Narebski2008-10-02
* | | Merge branch 'maint'Shawn O. Pearce2008-09-30
|\ \ \ | |/ /
| * | t0024: add executable permissionSZEDER Gábor2008-09-30
* | | tests: grep portability fixesJeff King2008-09-30
* | | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-29
|\ \ \
| * \ \ Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce2008-09-29
| |\ \ \ | | |/ /
| | * | Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-29
| | |\ \
| * | | | t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey2008-09-23
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-22
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey2008-09-22
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-18
| |\ \ \ \ | | |/ / /
| | * | | diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-18
* | | | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\ \ \ \ \
| * | | | | checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-31
| * | | | | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-30
| * | | | | Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Junio C Hamano2008-08-30
| |\ \ \ \ \
| | * | | | | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-30
| | * | | | | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-30
| * | | | | | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-30
| * | | | | | xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-30
* | | | | | | Merge branch 'maint'Shawn O. Pearce2008-09-26
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Remove empty directories in recursive mergeAlex Riesen2008-09-26
* | | | | | | Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \
| * | | | | | | builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna2008-09-06
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'am/status'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \
| * | | | | | | wt-status: Teach how to discard changes in the working directoryAnders Melchiorsen2008-09-07
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'mv/commit-tree'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \
| * | | | | | | t7603: add new testcases to ensure builtin-commit uses reduce_heads()Miklos Vajna2008-09-10
* | | | | | | | Merge branch 'maint'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | maint: check return of split_cmdline to avoid bad config stringsDeskin Miller2008-09-24
* | | | | | | | git-svn: do a partial rebuild if rev_map is out-of-dateDeskin Miller2008-09-21
* | | | | | | | git-svn: testcase for partial rebuildDeskin Miler2008-09-21
* | | | | | | | Merge branch 'db/maint-checkout-b'Junio C Hamano2008-09-21
|\ \ \ \ \ \ \ \