Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | refs.c: add err arguments to reflog functions | David Turner | 2015-07-21 | 3 | -60/+81 | |
* | | | | | | | | | | | | | | Merge branch 'as/sparse-checkout-removal' | Junio C Hamano | 2015-08-03 | 2 | -0/+56 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | unpack-trees: don't update files with CE_WT_REMOVE setas/sparse-checkout-removal | David Turner | 2015-07-21 | 2 | -0/+56 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/date-mode-format' | Junio C Hamano | 2015-08-03 | 28 | -78/+172 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | strbuf: make strbuf_addftime more robustjk/date-mode-format | Jeff King | 2015-07-20 | 2 | -17/+31 | |
| * | | | | | | | | | | | | | | introduce "format" date-mode | Jeff King | 2015-06-29 | 8 | -1/+61 | |
| * | | | | | | | | | | | | | | convert "enum date_mode" into a struct | Jeff King | 2015-06-29 | 23 | -77/+97 | |
| * | | | | | | | | | | | | | | show-branch: use DATE_RELATIVE instead of magic number | Jeff King | 2015-06-29 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'pt/am-tests' | Junio C Hamano | 2015-08-03 | 4 | -0/+313 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t3901: test git-am encoding conversionpt/am-tests | Paul Tan | 2015-07-20 | 1 | -0/+62 | |
| * | | | | | | | | | | | | | | t3418: non-interactive rebase --continue with rerere enabled | Paul Tan | 2015-07-20 | 1 | -0/+19 | |
| * | | | | | | | | | | | | | | t4150: tests for am --[no-]scissors | Paul Tan | 2015-07-20 | 1 | -0/+48 | |
| * | | | | | | | | | | | | | | t4150: am with post-applypatch hook | Paul Tan | 2015-07-20 | 1 | -0/+38 | |
| * | | | | | | | | | | | | | | t4150: am with pre-applypatch hook | Paul Tan | 2015-07-20 | 1 | -0/+33 | |
| * | | | | | | | | | | | | | | t4150: am with applypatch-msg hook | Paul Tan | 2015-07-20 | 1 | -0/+35 | |
| * | | | | | | | | | | | | | | t4150: am --resolved fails if index has unmerged entries | Paul Tan | 2015-07-20 | 1 | -0/+13 | |
| * | | | | | | | | | | | | | | t4150: am --resolved fails if index has no changes | Paul Tan | 2015-07-20 | 1 | -0/+12 | |
| * | | | | | | | | | | | | | | t4150: am refuses patches when paused | Paul Tan | 2015-07-20 | 1 | -0/+14 | |
| * | | | | | | | | | | | | | | t4151: am --abort will keep dirty index intact | Paul Tan | 2015-07-20 | 1 | -0/+15 | |
| * | | | | | | | | | | | | | | t4150: am fails if index is dirty | Paul Tan | 2015-07-20 | 1 | -0/+12 | |
| * | | | | | | | | | | | | | | t4150: am.messageid really adds the message id | Paul Tan | 2015-07-07 | 1 | -0/+12 | |
* | | | | | | | | | | | | | | | Merge branch 'sg/bash-prompt-untracked-optim' | Junio C Hamano | 2015-08-03 | 2 | -1/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | bash prompt: faster untracked status indicator with untracked directoriessg/bash-prompt-untracked-optim | SZEDER Gábor | 2015-07-20 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | bash prompt: test untracked files status indicator with untracked dirs | SZEDER Gábor | 2015-07-20 | 1 | -0/+25 | |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'cb/uname-in-untracked' | Junio C Hamano | 2015-08-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | untracked: fix detection of uname(2) failurecb/uname-in-untracked | Charles Bailey | 2015-07-17 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | Merge branch 'se/doc-checkout-ours-theirs' | Junio C Hamano | 2015-08-03 | 1 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | checkout: document subtlety around --ours/--theirsse/doc-checkout-ours-theirs | Simon A. Eugster | 2015-07-12 | 1 | -0/+15 | |
* | | | | | | | | | | | | | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string' | Junio C Hamano | 2015-08-03 | 3 | -68/+92 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-string | Ilya Bobyr | 2015-07-15 | 3 | -68/+92 | |
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'mh/fast-import-optimize-current-from' | Junio C Hamano | 2015-08-03 | 1 | -12/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | fast-import: do less work when given "from" matches current branch headmh/fast-import-optimize-current-from | Mike Hommey | 2015-07-13 | 1 | -12/+17 | |
| |/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'kn/tag-doc-fix' | Junio C Hamano | 2015-08-03 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Documentation/tag: remove double occurance of "<pattern>"kn/tag-doc-fix | Karthik Nayak | 2015-07-10 | 1 | -1/+0 | |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'mh/fast-import-get-mark' | Junio C Hamano | 2015-08-03 | 3 | -10/+75 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | fast-import: add a get-mark commandmh/fast-import-get-mark | Michael Haggerty | 2015-07-01 | 3 | -10/+75 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-08-03 | 5 | -6/+338 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | git rebase -i: add static check for commands and SHA-1 | Galan Rémi | 2015-06-30 | 3 | -0/+116 | |
| * | | | | | | | | | | | | | | | | | | git rebase -i: warn about removed commits | Galan Rémi | 2015-06-30 | 4 | -3/+197 | |
| * | | | | | | | | | | | | | | | | | | git-rebase -i: add command "drop" to remove a commit | Galan Rémi | 2015-06-30 | 4 | -3/+25 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/commit-slab' | Junio C Hamano | 2015-08-03 | 2 | -13/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | commit-slab: introduce slabname##_peek() functionjc/commit-slab | Junio C Hamano | 2015-05-22 | 2 | -13/+49 | |
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'dt/log-follow-config' | Junio C Hamano | 2015-08-03 | 5 | -2/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | log: add "log.follow" configuration variable | David Turner | 2015-07-09 | 5 | -2/+49 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'gp/status-rebase-i-info' | Junio C Hamano | 2015-08-03 | 2 | -31/+346 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | status: add new tests for status during rebase -igp/status-rebase-i-info | Guillaume Pagès | 2015-07-06 | 1 | -0/+87 | |
| * | | | | | | | | | | | | | | | | | | | | status: give more information during rebase -i | Guillaume Pagès | 2015-07-06 | 2 | -0/+225 | |
| * | | | | | | | | | | | | | | | | | | | | status: differentiate interactive from non-interactive rebases | Guillaume Pagès | 2015-06-30 | 2 | -15/+18 | |
| * | | | | | | | | | | | | | | | | | | | | status: factor two rebase-related messages together | Guillaume Pagès | 2015-06-30 | 1 | -16/+16 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/cat-file-batch-all' | Junio C Hamano | 2015-08-03 | 3 | -35/+137 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |